diff options
Diffstat (limited to 'chrome/test/startup')
| -rw-r--r-- | chrome/test/startup/startup_test.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc index eac8173..56850e6 100644 --- a/chrome/test/startup/startup_test.cc +++ b/chrome/test/startup/startup_test.cc @@ -160,12 +160,18 @@ TEST_F(StartupTest, PerfCold) { UITest::DEFAULT_THEME); } +#if defined(OS_MACOSX) +// TODO(mpcomplete): running these tests on a mac builder results in leaked +// chrome processes, causing the build slave to hang. +// http://code.google.com/p/chromium/issues/detail?id=22287 +#else TEST_F(StartupTest, PerfExtensionEmpty) { SetUpWithFileURL(); SetUpWithExtensionsProfile("empty"); RunStartupTest("warm", "t", false /* cold */, false /* not important */, UITest::DEFAULT_THEME); } +x TEST_F(StartupTest, PerfExtensionToolstrips1) { SetUpWithFileURL(); @@ -198,7 +204,7 @@ TEST_F(StartupTest, PerfExtensionContentScript50) { false /* cold */, false /* not important */, UITest::DEFAULT_THEME); } - +#endif #if defined(OS_WIN) // TODO(port): Enable gears tests on linux/mac once gears is working. |