summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-03 14:59:47 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-03 14:59:47 +0000
commit89825bbc7634e04e995049e15390629e8b5d5f99 (patch)
tree20fd93e69bf1f1ff78247ae37e6f5e46a8f5e9f1
parent7c4bdd68dda2d879884d186352f34c58482d3a56 (diff)
downloadchromium_src-89825bbc7634e04e995049e15390629e8b5d5f99.zip
chromium_src-89825bbc7634e04e995049e15390629e8b5d5f99.tar.gz
chromium_src-89825bbc7634e04e995049e15390629e8b5d5f99.tar.bz2
Turn off tests that are failing on Windows.
BUG=98720,98721 TEST=N/A Review URL: http://codereview.chromium.org/8101007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103712 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ppapi/native_client/tests/ppapi_browser/bad/nacl.scons6
-rw-r--r--ppapi/native_client/tests/ppapi_browser/crash/nacl.scons6
2 files changed, 7 insertions, 5 deletions
diff --git a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
index e99ff4b..bae23f4 100644
--- a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
@@ -65,13 +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
+# This test is failing on Windows:
+# crbug.com/98720
env.AddNodeToTestSuite(node,
['chrome_browser_tests'],
'run_ppapi_bad_browser_test',
is_broken=env.PPAPIBrowserTesterIsBroken() or
- (env.Bit('nacl_glibc') and env.Bit('windows')))
+ env.Bit('host_windows'))
# Bad nexe tests that won't work in PNaCl (native)
diff --git a/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons b/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons
index 5285875..d9b6a22 100644
--- a/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/crash/nacl.scons
@@ -49,8 +49,10 @@ node = env.PPAPIBrowserTester('ppapi_crash_browser_test.out',
url='ppapi_crash.html',
nmfs=nmfs,
files=published_files)
-
+# This test is failing on Windows:
+# crbug.com/98721
env.AddNodeToTestSuite(node,
['chrome_browser_tests'],
'run_ppapi_crash_browser_test',
- is_broken=env.PPAPIBrowserTesterIsBroken())
+ is_broken=env.PPAPIBrowserTesterIsBroken() or
+ env.Bit('host_windows'))