Commit 8ac3d7f3 authored by ncbray@google.com's avatar ncbray@google.com

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
parent fc7e7a9a
...@@ -12,11 +12,6 @@ def Main(args): ...@@ -12,11 +12,6 @@ def Main(args):
pwd = os.environ.get('PWD', '') pwd = os.environ.get('PWD', '')
is_integration_bot = 'nacl-chrome' in 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 # On the main Chrome waterfall, we may need to control where the tests are
# run. # run.
# If there is serious skew in the PPAPI interface that causes all of # If there is serious skew in the PPAPI interface that causes all of
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment