summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorncbray@google.com <ncbray@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-26 17:55:48 +0000
committerncbray@google.com <ncbray@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-26 17:55:48 +0000
commit319a82e00c5fd3783f719ed820d753254326f45f (patch)
tree5db7ba2ef02b63ce3b96332bd85d9c46a2168cb9 /chrome
parent9c78058a691d24df80260ee8040c458427adc5df (diff)
downloadchromium_src-319a82e00c5fd3783f719ed820d753254326f45f.zip
chromium_src-319a82e00c5fd3783f719ed820d753254326f45f.tar.gz
chromium_src-319a82e00c5fd3783f719ed820d753254326f45f.tar.bz2
Disabled flaky nacl_integration test.
BUG= none TEST= none Review URL: http://codereview.chromium.org/7461083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rwxr-xr-xchrome/test/nacl_test_injection/buildbot_nacl_integration.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
index 61a5bc5..cc25a90 100755
--- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
+++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
@@ -28,7 +28,11 @@ def Main(args):
# them off on the main Chrome waterfall, but not on NaCl's integration bots.
# This makes it easier to see when things have been fixed NaCl side.
if not is_integration_bot:
- pass
+ if sys.platform == 'darwin':
+ # The following test has failed on Mac OS X 10.6.
+ # TODO(ncbray): Reenable when this issue is resolved.
+ # http://code.google.com/p/nativeclient/issues/detail?id=2091
+ tests_to_disable.append('run_ppapi_bad_browser_test')
if sys.platform == 'darwin':
# The following test is failing on Mac OS X 10.5. This may be