Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Side by Side Diff: chrome/test/startup/startup_test.cc

Issue 212022: Disable extension startup tests on Mac, since they're causing it to hang. (Closed)
Patch Set: Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/platform_thread.h" 7 #include "base/platform_thread.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/test_file_util.h" 9 #include "base/test_file_util.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 true /* important */, UITest::DEFAULT_THEME); 153 true /* important */, UITest::DEFAULT_THEME);
154 } 154 }
155 155
156 // TODO(mpcomplete): Should we have reference timings for all these? 156 // TODO(mpcomplete): Should we have reference timings for all these?
157 157
158 TEST_F(StartupTest, PerfCold) { 158 TEST_F(StartupTest, PerfCold) {
159 RunStartupTest("cold", "t", true /* cold */, false /* not important */, 159 RunStartupTest("cold", "t", true /* cold */, false /* not important */,
160 UITest::DEFAULT_THEME); 160 UITest::DEFAULT_THEME);
161 } 161 }
162 162
163 #if defined(OS_MACOSX)
164 // TODO(mpcomplete): running these tests on a mac builder results in leaked
165 // chrome processes, causing the build slave to hang.
166 // http://code.google.com/p/chromium/issues/detail?id=22287
167 #else
163 TEST_F(StartupTest, PerfExtensionEmpty) { 168 TEST_F(StartupTest, PerfExtensionEmpty) {
164 SetUpWithFileURL(); 169 SetUpWithFileURL();
165 SetUpWithExtensionsProfile("empty"); 170 SetUpWithExtensionsProfile("empty");
166 RunStartupTest("warm", "t", false /* cold */, false /* not important */, 171 RunStartupTest("warm", "t", false /* cold */, false /* not important */,
167 UITest::DEFAULT_THEME); 172 UITest::DEFAULT_THEME);
168 } 173 }
169 174
170 TEST_F(StartupTest, PerfExtensionToolstrips1) { 175 TEST_F(StartupTest, PerfExtensionToolstrips1) {
171 SetUpWithFileURL(); 176 SetUpWithFileURL();
172 SetUpWithExtensionsProfile("toolstrips1"); 177 SetUpWithExtensionsProfile("toolstrips1");
(...skipping 18 matching lines...) Expand all
191 UITest::DEFAULT_THEME); 196 UITest::DEFAULT_THEME);
192 } 197 }
193 198
194 TEST_F(StartupTest, PerfExtensionContentScript50) { 199 TEST_F(StartupTest, PerfExtensionContentScript50) {
195 SetUpWithFileURL(); 200 SetUpWithFileURL();
196 SetUpWithExtensionsProfile("content_scripts50"); 201 SetUpWithExtensionsProfile("content_scripts50");
197 RunStartupTest("warm", "extension_content_scripts50", 202 RunStartupTest("warm", "extension_content_scripts50",
198 false /* cold */, false /* not important */, 203 false /* cold */, false /* not important */,
199 UITest::DEFAULT_THEME); 204 UITest::DEFAULT_THEME);
200 } 205 }
201 206 #endif
202 207
203 #if defined(OS_WIN) 208 #if defined(OS_WIN)
204 // TODO(port): Enable gears tests on linux/mac once gears is working. 209 // TODO(port): Enable gears tests on linux/mac once gears is working.
205 TEST_F(StartupTest, PerfGears) { 210 TEST_F(StartupTest, PerfGears) {
206 SetUpWithFileURL(); 211 SetUpWithFileURL();
207 RunStartupTest("warm", "gears", false /* not cold */, 212 RunStartupTest("warm", "gears", false /* not cold */,
208 false /* not important */, UITest::DEFAULT_THEME); 213 false /* not important */, UITest::DEFAULT_THEME);
209 } 214 }
210 215
211 TEST_F(StartupTest, PerfColdGears) { 216 TEST_F(StartupTest, PerfColdGears) {
(...skipping 19 matching lines...) Expand all
231 false /* not important */, UITest::CUSTOM_FRAME); 236 false /* not important */, UITest::CUSTOM_FRAME);
232 } 237 }
233 238
234 TEST_F(StartupTest, PerfColdNativeFrameGtkTheme) { 239 TEST_F(StartupTest, PerfColdNativeFrameGtkTheme) {
235 RunStartupTest("warm", "custom-frame-gtk-theme", false /* warm */, 240 RunStartupTest("warm", "custom-frame-gtk-theme", false /* warm */,
236 false /* not important */, UITest::CUSTOM_FRAME_NATIVE_THEME); 241 false /* not important */, UITest::CUSTOM_FRAME_NATIVE_THEME);
237 } 242 }
238 #endif 243 #endif
239 244
240 } // namespace 245 } // namespace
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698