diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 01:17:31 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 01:17:31 +0000 |
| commit | 9a9f4a1ead7af556c88e04ed19b35fa0a3566112 (patch) | |
| tree | 2cd1bf7a64adda2cf49cc906502a940dcd029f20 /chrome/test/nacl_test_injection | |
| parent | 88a7cb5d56b6d6d2b1741d7384d01cd34201ab4d (diff) | |
| download | chromium_src-9a9f4a1ead7af556c88e04ed19b35fa0a3566112.zip chromium_src-9a9f4a1ead7af556c88e04ed19b35fa0a3566112.tar.gz chromium_src-9a9f4a1ead7af556c88e04ed19b35fa0a3566112.tar.bz2 | |
NaCl: Disable Breakpad tests on 32-bit Windows because they are flaky
This is a retry of r152413, fixed to use extend() rather than extends().
BUG=143413
TEST=nacl_integration
Review URL: https://chromiumcodereview.appspot.com/10834422
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl_test_injection')
| -rwxr-xr-x | chrome/test/nacl_test_injection/buildbot_nacl_integration.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py index 74a1b5a..066a923 100755 --- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py +++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py @@ -12,6 +12,12 @@ def Main(args): pwd = os.environ.get('PWD', '') is_integration_bot = 'nacl-chrome' in pwd + # This environment variable check mimics what + # buildbot_chrome_nacl_stage.py does. + is_win64 = (sys.platform in ('win32', 'cygwin') and + ('64' in os.environ.get('PROCESSOR_ARCHITECTURE', '') or + '64' in os.environ.get('PROCESSOR_ARCHITEW6432', ''))) + # On the main Chrome waterfall, we may need to control where the tests are # run. # If there is serious skew in the PPAPI interface that causes all of @@ -60,6 +66,18 @@ def Main(args): # See http://crbug.com/132395 tests_to_disable.append('run_inbrowser_test_runner') + if sys.platform in ('win32', 'cygwin') and not is_win64: + # The Breakpad tests have started failing on 32-bit Windows (but + # not 64-bit Windows) because Chromium is producing an excess + # crash dump. + # See http://code.google.com/p/chromium/issues/detail?id=143413 + # TODO(mseaborn): Change the tests to ignore the excess crash + # dump until we find out what is causing it. + tests_to_disable.extend([ + 'run_inbrowser_trusted_crash_in_startup_test', + 'run_inbrowser_crash_in_syscall_test', + 'run_inbrowser_untrusted_crash_test', + ]) if sys.platform in ('win32', 'cygwin'): tests_to_disable.append('run_ppapi_ppp_input_event_browser_test') |