summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl_test_injection
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 05:09:41 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 05:09:41 +0000
commit19845b043af3e773fef859740a126632aba98c5f (patch)
tree76cdedd15e4b1b39039b3aeedaa578cdc2efd9bb /chrome/test/nacl_test_injection
parent66aa80642ff7c69481e60dddd4963cd440b54684 (diff)
downloadchromium_src-19845b043af3e773fef859740a126632aba98c5f.zip
chromium_src-19845b043af3e773fef859740a126632aba98c5f.tar.gz
chromium_src-19845b043af3e773fef859740a126632aba98c5f.tar.bz2
NaCl: Re-enable run_inbrowser_test_runner on Windows
This was disabled because the dynamic_load_test_threaded.c was flaky on Windows. We have since disabled that subtest inside the browser, so it should be OK to re-enable the test suite as a whole. BUG=120355 TEST=nacl_integration Review URL: https://chromiumcodereview.appspot.com/10384190 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl_test_injection')
-rwxr-xr-xchrome/test/nacl_test_injection/buildbot_nacl_integration.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
index 8b52bdb..e95f4e9 100755
--- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
+++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
@@ -77,10 +77,6 @@ def Main(args):
# http://code.google.com/p/nativeclient/issues/detail?id=1835
tests_to_disable.append('run_ppapi_crash_browser_test')
- # See http://crbug.com/120355
- if sys.platform == 'win32':
- tests_to_disable.append('run_inbrowser_test_runner')
-
if sys.platform in ('win32', 'cygwin'):
tests_to_disable.append('run_ppapi_ppp_input_event_browser_test')