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

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

Issue 5460001: Mark StartupTest.PerfSeveralTabs as flaky on Win.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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 | Annotate | Revision Log
« 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/environment.h" 5 #include "base/environment.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/platform_thread.h" 8 #include "base/platform_thread.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_split.h" 10 #include "base/string_split.h"
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 RunPerfTestWithManyTabs("few_tabs", "restore-ref", 5, 2, true); 309 RunPerfTestWithManyTabs("few_tabs", "restore-ref", 5, 2, true);
310 } 310 }
311 311
312 #if defined(OS_MACOSX) 312 #if defined(OS_MACOSX)
313 // http://crbug.com/46609 313 // http://crbug.com/46609
314 #define MAYBE_PerfSeveralTabsReference FLAKY_PerfSeveralTabsReference 314 #define MAYBE_PerfSeveralTabsReference FLAKY_PerfSeveralTabsReference
315 #define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs 315 #define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs
316 // http://crbug.com/52858 316 // http://crbug.com/52858
317 #define MAYBE_PerfRestoreSeveralTabs FLAKY_PerfRestoreSeveralTabs 317 #define MAYBE_PerfRestoreSeveralTabs FLAKY_PerfRestoreSeveralTabs
318 #define MAYBE_PerfExtensionContentScript50 FLAKY_PerfExtensionContentScript50 318 #define MAYBE_PerfExtensionContentScript50 FLAKY_PerfExtensionContentScript50
319 #elif defined(OS_WIN)
320 // http://crbug.com/46609
321 #define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs
322 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference
323 #define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs
324 #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50
319 #else 325 #else
320 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference 326 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference
321 #define MAYBE_PerfSeveralTabs PerfSeveralTabs 327 #define MAYBE_PerfSeveralTabs PerfSeveralTabs
322 #define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs 328 #define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs
323 #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50 329 #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50
324 #endif 330 #endif
325 331
326 TEST_F(StartupTest, MAYBE_PerfSeveralTabs) { 332 TEST_F(StartupTest, MAYBE_PerfSeveralTabs) {
327 RunPerfTestWithManyTabs("several_tabs", "cmdline", 10, 4, false); 333 RunPerfTestWithManyTabs("several_tabs", "cmdline", 10, 4, false);
328 } 334 }
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 UITest::CUSTOM_FRAME, 0, 0); 399 UITest::CUSTOM_FRAME, 0, 0);
394 } 400 }
395 401
396 TEST_F(StartupTest, PerfNativeFrameGtkTheme) { 402 TEST_F(StartupTest, PerfNativeFrameGtkTheme) {
397 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT, 403 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT,
398 UITest::CUSTOM_FRAME_NATIVE_THEME, 0, 0); 404 UITest::CUSTOM_FRAME_NATIVE_THEME, 0, 0);
399 } 405 }
400 #endif 406 #endif
401 407
402 } // namespace 408 } // 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