summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorncbray@google.com <ncbray@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 20:31:21 +0000
committerncbray@google.com <ncbray@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 20:31:21 +0000
commit8ac3d7f37c22968d8a9863e772939fd39b2894af (patch)
treed6db70773df3f4234bb4425c4b5a2e77ae3c4e5d
parentfc7e7a9a4a95515a4290b6c20e12cbdf027828f1 (diff)
downloadchromium_src-8ac3d7f37c22968d8a9863e772939fd39b2894af.zip
chromium_src-8ac3d7f37c22968d8a9863e772939fd39b2894af.tar.gz
chromium_src-8ac3d7f37c22968d8a9863e772939fd39b2894af.tar.bz2
Re-enable nacl_integration on Mac.
The largest sources of flake should now be fixed or supressed. BUG= none TEST= none Review URL: http://codereview.chromium.org/8823014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113455 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xchrome/test/nacl_test_injection/buildbot_nacl_integration.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
index 83adbd8..b659c04 100755
--- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
+++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
@@ -12,11 +12,6 @@ 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