summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authordschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-14 18:31:58 +0000
committerdschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-14 18:31:58 +0000
commite9ef692967ffc7e5da31cfe8b031d4eabb6133e6 (patch)
treed7e9871f0a2e0a584d91971a728c7d9e76deb426 /ppapi
parentd75131b09bec4cd2a6d59c15826a4797680857c9 (diff)
downloadchromium_src-e9ef692967ffc7e5da31cfe8b031d4eabb6133e6.zip
chromium_src-e9ef692967ffc7e5da31cfe8b031d4eabb6133e6.tar.gz
chromium_src-e9ef692967ffc7e5da31cfe8b031d4eabb6133e6.tar.bz2
Disable NaCl inbrowser_test_runner_parallel test
It's quite flaky on 32 bit windows TBR=ncbray@chromium.org,mseaborn@chromium.org BUG= http://code.google.com/p/chromium/issues/detail?id=162037 Review URL: https://codereview.chromium.org/11572048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-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()