diff options
author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 19:06:17 +0000 |
---|---|---|
committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 19:06:17 +0000 |
commit | f4508a8de964f68130a28cd8736938dd3656f847 (patch) | |
tree | bfb33deb3d11ed72b8c72e5799d25bcd5af8d4f6 /ppapi/native_client | |
parent | 31c31b2bab65f6b0f87ab234aa0f253f9f55f4df (diff) | |
download | chromium_src-f4508a8de964f68130a28cd8736938dd3656f847.zip chromium_src-f4508a8de964f68130a28cd8736938dd3656f847.tar.gz chromium_src-f4508a8de964f68130a28cd8736938dd3656f847.tar.bz2 |
Disable ppapi_bad test for glibc on Windows.
This test is timing out on Windows 7 and blocking a DEPS roll. This CL partly undoes the following CL which enabled the test everywhere for glibc:
http://codereview.chromium.org/7979018
The failure is currently visible on the Win7 chrome integration bot:
http://chromegw.corp.google.com/i/client.nacl.chrome/builders/win7-nacl-chrome-test
http://chromegw.corp.google.com/i/client.nacl.chrome/console
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2191
TEST=run ./scons --mode=dbg-host,nacl platform=x86-64 --nacl_glibc run_ppapi_bad_browser_test
Review URL: http://codereview.chromium.org/8056008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
-rw-r--r-- | ppapi/native_client/tests/ppapi_browser/bad/nacl.scons | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons index 36da0ab..e99ff4b 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons @@ -65,10 +65,13 @@ node = env.PPAPIBrowserTester( files=[env.File(f) for f in ppapi_bad_files], args=['--allow_404']) +# This test is timing out with glibc on Windows 7: +# http://code.google.com/p/nativeclient/issues/detail?id=2191 env.AddNodeToTestSuite(node, ['chrome_browser_tests'], 'run_ppapi_bad_browser_test', - is_broken=env.PPAPIBrowserTesterIsBroken()) + is_broken=env.PPAPIBrowserTesterIsBroken() or + (env.Bit('nacl_glibc') and env.Bit('windows'))) # Bad nexe tests that won't work in PNaCl (native) |