summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-06 04:41:57 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-06 04:41:57 +0000
commite4afb5c8ad3e23b7d37af1f1e9c4ebc5d264131a (patch)
tree8dc9c70621b4e6be9faf3a3e0dd5accffbb95544
parent7a061ae07c80278acb0568c5f29ca395ad7a07be (diff)
downloadchromium_src-e4afb5c8ad3e23b7d37af1f1e9c4ebc5d264131a.zip
chromium_src-e4afb5c8ad3e23b7d37af1f1e9c4ebc5d264131a.tar.gz
chromium_src-e4afb5c8ad3e23b7d37af1f1e9c4ebc5d264131a.tar.bz2
PPAPITest.Scrollbar fails on Windows
Marks PPAPITest.Scrollbar as fails on Windows. BUG=85010 TEST=PPAPITest.Scrollbar TBR=polina@google.com, thakis@chromium.org Review URL: http://codereview.chromium.org/7111028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87967 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/ui/ppapi_uitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index 25563856..e184e36 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -148,7 +148,13 @@ TEST_F(PPAPITest,PaintAggregator) {
RunTestViaHTTP("PaintAggregator");
}
-TEST_F(PPAPITest, Scrollbar) {
+// Fails consistently on Windows. See crbug.com/85010 for details.
+#if defined(OS_WIN)
+#define MAYBE_Scrollbar FAILS_Scrollbar
+#else
+#define MAYBE_Scrollbar Scrollbar
+#endif
+TEST_F(PPAPITest, MAYBE_Scrollbar) {
RunTest("Scrollbar");
}