summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 20:31:28 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 20:31:28 +0000
commit1a2b4c88a5719c84a7888136efc4088e6c2e9301 (patch)
tree47f49761c835b5bb092d2bee579849caf15152df /chrome/test
parent1caa15278af3ae6abbdaab3dd21d238deae4fc4a (diff)
downloadchromium_src-1a2b4c88a5719c84a7888136efc4088e6c2e9301.zip
chromium_src-1a2b4c88a5719c84a7888136efc4088e6c2e9301.tar.gz
chromium_src-1a2b4c88a5719c84a7888136efc4088e6c2e9301.tar.bz2
Mark StartupTest.PerfSeveralTabs as flaky on Win.
BUG=46609 TEST=Should turn green! Review URL: http://codereview.chromium.org/5460001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/startup/startup_test.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 1b36dcb2..5cbdc10 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -316,6 +316,12 @@ TEST_F(StartupTest, PerfRestoreFewTabsReference) {
// http://crbug.com/52858
#define MAYBE_PerfRestoreSeveralTabs FLAKY_PerfRestoreSeveralTabs
#define MAYBE_PerfExtensionContentScript50 FLAKY_PerfExtensionContentScript50
+#elif defined(OS_WIN)
+// http://crbug.com/46609
+#define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs
+#define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference
+#define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs
+#define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50
#else
#define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference
#define MAYBE_PerfSeveralTabs PerfSeveralTabs