summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-19 22:29:47 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-19 22:29:47 +0000
commitee1387f731e26ff9b4c131d766285d2743f5e1d7 (patch)
tree6f50af687c565365bfd55f4a53b290089233128a
parent5baedd8b61a71fa9a064944b71ce3e99564a1d0f (diff)
downloadchromium_src-ee1387f731e26ff9b4c131d766285d2743f5e1d7.zip
chromium_src-ee1387f731e26ff9b4c131d766285d2743f5e1d7.tar.gz
chromium_src-ee1387f731e26ff9b4c131d766285d2743f5e1d7.tar.bz2
DISABLE PPAPINaClGLibcTest.FileIO which is flaky
BUG=321300 R=yzshen@chromium.org Review URL: https://codereview.chromium.org/69343014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236061 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/ppapi/ppapi_browsertest.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
index dc41dde..975dfa9 100644
--- a/chrome/test/ppapi/ppapi_browsertest.cc
+++ b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -863,12 +863,8 @@ IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_Nacl_Newlib_FileIO) {
);
}
// Flaky on 32-bit linux bot; http://crbug.com/308905
-#if defined(OS_LINUX) && defined(ARCH_CPU_X86)
-#define MAYBE_NaCl_Glibc_FileIO DISABLED_FileIO
-#else
-#define MAYBE_NaCl_Glibc_FileIO FileIO
-#endif
-IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_NaCl_Glibc_FileIO) {
+// Flaky on Windows too; http://crbug.com/321300
+IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, DISABLED_NaCl_Glibc_FileIO) {
RunTestViaHTTP(
LIST_TEST(FileIO_Open)
LIST_TEST(FileIO_AbortCalls)