summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 22:44:44 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 22:44:44 +0000
commite18f89a80abfa1ca7b4736002a797e407b3fef9b (patch)
tree99d80b9a51b488936273644a8841e508c44c49b4
parent568a8c740e26c089b19f3b11da0648e551bef2f5 (diff)
downloadchromium_src-e18f89a80abfa1ca7b4736002a797e407b3fef9b.zip
chromium_src-e18f89a80abfa1ca7b4736002a797e407b3fef9b.tar.gz
chromium_src-e18f89a80abfa1ca7b4736002a797e407b3fef9b.tar.bz2
Re-enable startup tests on Mac since process leak bug fixed.
BUG=http://crbug.com/22287 Review URL: http://codereview.chromium.org/505041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34888 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/startup/startup_test.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 0934909..4c9d08d 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -163,11 +163,6 @@ 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");
@@ -206,7 +201,6 @@ 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.