diff options
| author | ncbray@google.com <ncbray@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 22:30:46 +0000 |
|---|---|---|
| committer | ncbray@google.com <ncbray@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 22:30:46 +0000 |
| commit | b9800daa6f14b86c69214b67bfa28f37b78370e8 (patch) | |
| tree | 2b3fdaceaf5fe81b6d52af01c0438af1d7c5e966 /chrome | |
| parent | 6bf16ba3c7ddc2a31e154eb108b83f28a126a6d5 (diff) | |
| download | chromium_src-b9800daa6f14b86c69214b67bfa28f37b78370e8.zip chromium_src-b9800daa6f14b86c69214b67bfa28f37b78370e8.tar.gz chromium_src-b9800daa6f14b86c69214b67bfa28f37b78370e8.tar.bz2 | |
Rolled NaCl into Chrome.
BUG= none
TEST= none
Review URL: http://codereview.chromium.org/7464043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rwxr-xr-x | chrome/test/nacl_test_injection/buildbot_nacl_integration.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py index 00ca7bc..61a5bc5 100755 --- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py +++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py @@ -22,10 +22,14 @@ def Main(args): #if not is_integration_bot: # return - # TODO(polina): turn these back on when this bug is fixed: - # http://code.google.com/p/nativeclient/issues/detail?id=2080 - tests_to_disable = ['run_ppapi_crash_browser_test', - 'run_ppapi_bad_browser_test'] + tests_to_disable = [] + + # In general, you should disable tests inside this conditional. This turns + # 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 is failing on Mac OS X 10.5. This may be # because of a kernel bug that we might need to work around. |