summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl_test_injection
diff options
context:
space:
mode:
authorpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-23 05:01:39 +0000
committerpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-23 05:01:39 +0000
commite1132cfe5d403e8c5b32c487dc03d71fe883b52e (patch)
tree6a7b544c62041d9224060104fdc431ae6668f65e /chrome/test/nacl_test_injection
parent373e65ed203d0acd9c1bf20fb2c91dabe50b7bc4 (diff)
downloadchromium_src-e1132cfe5d403e8c5b32c487dc03d71fe883b52e.zip
chromium_src-e1132cfe5d403e8c5b32c487dc03d71fe883b52e.tar.gz
chromium_src-e1132cfe5d403e8c5b32c487dc03d71fe883b52e.tar.bz2
DEPS: bump nacl_revision to 6184. Disable crash tests that uncovered
a bug in chrome until we fix it. Review URL: http://codereview.chromium.org/7484049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl_test_injection')
-rwxr-xr-xchrome/test/nacl_test_injection/buildbot_nacl_integration.py5
1 files changed, 4 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 9946e17..00ca7bc 100755
--- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
+++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
@@ -22,7 +22,10 @@ def Main(args):
#if not is_integration_bot:
# return
- tests_to_disable = []
+ # TODO(polina): turn these back on when this bug is fixed:
+ # http://code.google.com/p/nativeclient/issues/detail?id=2080
+ tests_to_disable = ['run_ppapi_crash_browser_test',
+ 'run_ppapi_bad_browser_test']
if sys.platform == 'darwin':
# The following test is failing on Mac OS X 10.5. This may be
# because of a kernel bug that we might need to work around.