summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl_test_injection
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 02:34:32 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 02:34:32 +0000
commit0c3d29e61872c6dc60a370feddc76a8adb968baa (patch)
tree5aaca5c2d9a3cd4a08715fdd52e7a735679793ce /chrome/test/nacl_test_injection
parentc0bcb3dc6e3b1989250fe323abded82be375c200 (diff)
downloadchromium_src-0c3d29e61872c6dc60a370feddc76a8adb968baa.zip
chromium_src-0c3d29e61872c6dc60a370feddc76a8adb968baa.tar.gz
chromium_src-0c3d29e61872c6dc60a370feddc76a8adb968baa.tar.bz2
Pull new NaCl, Pull the NaCl version of PPAPI into the Chrome checkout. Enable
integration tests that were disabled waiting for this. Review URL: http://codereview.chromium.org/7320003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl_test_injection')
-rwxr-xr-xchrome/test/nacl_test_injection/buildbot_nacl_integration.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
index 3800d9b..5f0f2a9 100755
--- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
+++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
@@ -23,7 +23,7 @@ def Main():
# Uncomment the following line if there is skew in the PPAPI interface
# and the tests are failing. Comment out once the issues are resolved.
- return
+ #return
script_dir = os.path.dirname(os.path.abspath(__file__))
test_dir = os.path.dirname(script_dir)