diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 21:19:28 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 21:19:28 +0000 |
| commit | fce98b6e4b7ea94a60cfcf1531d832dd0dd18c91 (patch) | |
| tree | 87616f76043b595942f3adfeed66986106b7409c /chrome/test/startup | |
| parent | d1d052e7a1d4394a34197abf956ad6a7f5dcfcd5 (diff) | |
| download | chromium_src-fce98b6e4b7ea94a60cfcf1531d832dd0dd18c91.zip chromium_src-fce98b6e4b7ea94a60cfcf1531d832dd0dd18c91.tar.gz chromium_src-fce98b6e4b7ea94a60cfcf1531d832dd0dd18c91.tar.bz2 | |
Disable extension startup tests on Mac, since they're causing it to hang.
BUG=22287
TEST=no
TBR=erikkay
Review URL: http://codereview.chromium.org/212022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26619 0039d316-1c4b-4281-b951-d872f2087c98
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. |