summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authordumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-13 02:32:51 +0000
committerdumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-13 02:32:51 +0000
commitb8113a55465521d094d5c035e5d38b2e2237d014 (patch)
treeda58244945030cb0a404c7291b78d2cfcdbb3312 /chrome/test
parent7273bc7b0e3716531aed9c20635f0847c5a4cddd (diff)
downloadchromium_src-b8113a55465521d094d5c035e5d38b2e2237d014.zip
chromium_src-b8113a55465521d094d5c035e5d38b2e2237d014.tar.gz
chromium_src-b8113a55465521d094d5c035e5d38b2e2237d014.tar.bz2
Looks like PPAPITest.FileIO fails on Win XP (dbg) too, disable for now...
BUG=none TEST=none TBR=darin Review URL: http://codereview.chromium.org/4951001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/ui/ppapi_uitest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index 7024f1b..060c88d 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -136,13 +136,13 @@ TEST_F(PPAPITest, Var) {
RunTest("Var");
}
-// TODO(dumi): figure out why this test is flaky on Mac and fix it.
-#if defined(OS_MACOSX)
-#define DISABLED_ON_MAC(test_name) DISABLED_##test_name
+// TODO(dumi): figure out why this test is flaky on Mac and Win XP (dbg).
+#if defined(OS_MACOSX) || defined(OS_WIN)
+#define DISABLED_ON_MAC_AND_WIN(test_name) DISABLED_##test_name
#else
-#define DISABLED_ON_MAC(test_name) test_name
+#define DISABLED_ON_MAC_AND_WIN(test_name) test_name
#endif
-TEST_F(PPAPITest, DISABLED_ON_MAC(FileIO)) {
+TEST_F(PPAPITest, DISABLED_ON_MAC_AND_WIN(FileIO)) {
RunTestViaHTTP("FileIO");
}