summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/nacl_test_injection/buildbot_nacl_integration.py')
-rwxr-xr-xchrome/test/nacl_test_injection/buildbot_nacl_integration.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
index 3191bf3..7c46ab7 100755
--- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
+++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
@@ -9,6 +9,10 @@ import sys
def Main():
+ # TODO(ncbray): figure out why this is failing on windows and enable.
+ if (sys.platform in ['win32', 'cygwin'] and
+ 'xp-nacl-chrome' not in os.environ.get('PWD', '')): return
+
script_dir = os.path.dirname(os.path.abspath(__file__))
test_dir = os.path.dirname(script_dir)
chrome_dir = os.path.dirname(test_dir)
@@ -17,8 +21,7 @@ def Main():
src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py')
cmd = [sys.executable, nacl_integration_script] + sys.argv[1:]
print cmd
- # TODO(bradnelson): turn on when test is green.
- #subprocess.check_call(cmd)
+ subprocess.check_call(cmd)
if __name__ == '__main__':