summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons5
1 files changed, 4 insertions, 1 deletions
diff --git a/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons b/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons
index 60ae804..33ed844 100644
--- a/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons
+++ b/ppapi/native_client/tests/nacl_browser/inbrowser_test_runner/nacl.scons
@@ -50,7 +50,10 @@ def AddTest(env, test_name, exe_list, parallel=False):
env.AddNodeToTestSuite(node, ['chrome_browser_tests'], test_name,
disable_irt_suffix=True,
is_broken=env.PPAPIBrowserTesterIsBroken() or
- env.Bit('running_on_valgrind'))
+ env.Bit('running_on_valgrind') or
+ # inbrowser_test_runner_parallel is flaky on 32 bit windows
+ # (maybe http://code.google.com/p/chromium/issues/detail?id=120355 ?)
+ parallel)
if not env.Bit('tests_use_irt'):
Return()