diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 04:33:41 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 04:33:41 +0000 |
| commit | 37622bef41da7ecc4544a15b4cc73318d8a4538f (patch) | |
| tree | c1cee6d60a946d382caa33f3e4d779387d9f7bc6 /chrome/test/nacl_test_injection | |
| parent | 8867f92212cd48c94c6c3ade0a26fdbba960be6c (diff) | |
| download | chromium_src-37622bef41da7ecc4544a15b4cc73318d8a4538f.zip chromium_src-37622bef41da7ecc4544a15b4cc73318d8a4538f.tar.gz chromium_src-37622bef41da7ecc4544a15b4cc73318d8a4538f.tar.bz2 | |
Revert 112097 - Re-enable nacl_integration on Mac.
NaCl revision 7294 fixed the bug that let a test to run forever.
BUG= http://code.google.com/p/chromium/issues/detail?id=105406
TEST= none
Review URL: http://codereview.chromium.org/8724006
TBR=ncbray@google.com
Review URL: http://codereview.chromium.org/8745005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112118 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 | 5 |
1 files changed, 5 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 b659c04..83adbd8 100755 --- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py +++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py @@ -12,6 +12,11 @@ def Main(args): pwd = os.environ.get('PWD', '') is_integration_bot = 'nacl-chrome' in pwd + if not is_integration_bot and sys.platform == 'darwin': + # TODO: Reenable. + sys.stdout.write('Skipping nacl_integration, see http://crbug.com/105406\n') + return + # 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 |