diff options
| author | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-09 04:42:19 +0000 |
|---|---|---|
| committer | cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-09 04:42:19 +0000 |
| commit | ae78f4a223d043b10dd9b5eee30cf8d0b6d6230e (patch) | |
| tree | 2cc11a6b8e65c7b716de9da7dc3a7ca866f782c4 | |
| parent | 3751593896aec722a8f0ad6014cbc2c67a9e78d9 (diff) | |
| download | chromium_src-ae78f4a223d043b10dd9b5eee30cf8d0b6d6230e.zip chromium_src-ae78f4a223d043b10dd9b5eee30cf8d0b6d6230e.tar.gz chromium_src-ae78f4a223d043b10dd9b5eee30cf8d0b6d6230e.tar.bz2 | |
Mark PerfComplexTheme flaky on Win+Debug.
BUG=99604
TBR=nsylvain@chromium.org
Review URL: http://codereview.chromium.org/8214002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104670 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/perf/startup_test.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc index 80ac34c..4666bab 100644 --- a/chrome/test/perf/startup_test.cc +++ b/chrome/test/perf/startup_test.cc @@ -367,6 +367,13 @@ TEST_F(StartupTest, PerfRestoreFewTabsReference) { #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50 #endif +// http://crbug.com/99604 +#if defined(OS_WIN) && !defined(NDEBUG) +#define MAYBE_PerfComplexTheme FLAKY_PerfComplexTheme +#else +#define MAYBE_PerfComplexTheme PerfComplexTheme +#endif + TEST_F(StartupTest, MAYBE_PerfSeveralTabs) { RunPerfTestWithManyTabs("several_tabs", "cmdline", 10, 4, false); } @@ -406,7 +413,7 @@ TEST_F(StartupTest, MAYBE_PerfExtensionContentScript50) { UITestBase::DEFAULT_THEME, 1, 0); } -TEST_F(StartupTest, PerfComplexTheme) { +TEST_F(StartupTest, MAYBE_PerfComplexTheme) { RunStartupTest("warm", "t-theme", WARM, NOT_IMPORTANT, UITestBase::COMPLEX_THEME, 0, 0); } |