summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 04:41:07 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-28 04:41:07 +0000
commitbe8d910cf49c219370958ed1b66d35c0b8e167e5 (patch)
tree8e225939e56c7517fb758f6c85f2ceb1e160e7db /chrome
parentdf63cd1ad8c480d9f7e7ec76794488bfd32535ff (diff)
downloadchromium_src-be8d910cf49c219370958ed1b66d35c0b8e167e5.zip
chromium_src-be8d910cf49c219370958ed1b66d35c0b8e167e5.tar.gz
chromium_src-be8d910cf49c219370958ed1b66d35c0b8e167e5.tar.bz2
mac: Disable nacl integration tests.
They take over 11h in some runs on the trybots. BUG=105406 TEST=none TBR=ncbray Review URL: http://codereview.chromium.org/8698012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rwxr-xr-xchrome/test/nacl_test_injection/buildbot_nacl_integration.py5
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 1636c77..0ab630b 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