summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 21:54:17 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 21:54:17 +0000
commit3edc45b0502450007b6dd3eb27ba20e4117754e0 (patch)
treec6257b889406cfa56b8df55d80f5d9e6e0f60e67
parentfeff4f00fc8072237746171122d1ab3702f89a9c (diff)
downloadchromium_src-3edc45b0502450007b6dd3eb27ba20e4117754e0.zip
chromium_src-3edc45b0502450007b6dd3eb27ba20e4117754e0.tar.gz
chromium_src-3edc45b0502450007b6dd3eb27ba20e4117754e0.tar.bz2
Disable tests on Mac Perf bot
Unhappy tests: StartupTest.PerfFewTabsReference StartupTest.PerfRestoreFewTabsReference StartupTest.PerfRestoreSeveralTabsReference BUG=135059 TBR=pathorn@chromium.org Review URL: https://chromiumcodereview.appspot.com/10690026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144809 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/perf/startup_test.cc17
1 files changed, 14 insertions, 3 deletions
diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc
index 701c1a8..5069a1d 100644
--- a/chrome/test/perf/startup_test.cc
+++ b/chrome/test/perf/startup_test.cc
@@ -352,7 +352,18 @@ TEST_F(StartupTest, MAYBE_PerfFewTabs) {
RunPerfTestWithManyTabs("few_tabs", "cmdline", 5, 2, false);
}
-TEST_F(StartupTest, PerfFewTabsReference) {
+// http://crbug.com/135059
+#if defined(OS_MACOSX)
+#define MAYBE_PerfFewTabsReference DISABLED_PerfFewTabsReference
+#define MAYBE_PerfRestoreFewTabsReference DISABLED_PerfRestoreFewTabsReference
+#define MAYBE_PerfRestoreSeveralTabsReference DISABLED_PerfRestoreSeveralTabsReference
+#else
+#define MAYBE_PerfFewTabsReference PerfFewTabsReference
+#define MAYBE_PerfRestoreFewTabsReference PerfRestoreFewTabsReference
+#define MAYBE_PerfRestoreSeveralTabsReference PerfRestoreSeveralTabsReference
+#endif
+
+TEST_F(StartupTest, MAYBE_PerfFewTabsReference) {
UseReferenceBuild();
RunPerfTestWithManyTabs("few_tabs", "cmdline-ref", 5, 2, false);
}
@@ -361,7 +372,7 @@ TEST_F(StartupTest, PerfRestoreFewTabs) {
RunPerfTestWithManyTabs("few_tabs", "restore", 5, 2, true);
}
-TEST_F(StartupTest, PerfRestoreFewTabsReference) {
+TEST_F(StartupTest, MAYBE_PerfRestoreFewTabsReference) {
UseReferenceBuild();
RunPerfTestWithManyTabs("few_tabs", "restore-ref", 5, 2, true);
}
@@ -412,7 +423,7 @@ TEST_F(StartupTest, MAYBE_PerfRestoreSeveralTabs) {
RunPerfTestWithManyTabs("several_tabs", "restore", 10, 4, true);
}
-TEST_F(StartupTest, PerfRestoreSeveralTabsReference) {
+TEST_F(StartupTest, MAYBE_PerfRestoreSeveralTabsReference) {
UseReferenceBuild();
RunPerfTestWithManyTabs("several_tabs", "restore-ref", 10, 4, true);
}