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

Side by Side Diff: chrome/test/perf/dromaeo_benchmark_uitest.cc

Issue 10836269: Disable DromaeoTest.DOMCorePerf on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 DromaeoReferenceTest() : DromaeoTest() { 127 DromaeoReferenceTest() : DromaeoTest() {
128 reference_ = true; 128 reference_ = true;
129 } 129 }
130 130
131 void SetUp() { 131 void SetUp() {
132 UseReferenceBuild(); 132 UseReferenceBuild();
133 DromaeoTest::SetUp(); 133 DromaeoTest::SetUp();
134 } 134 }
135 }; 135 };
136 136
137 TEST_F(DromaeoTest, DOMCorePerf) { 137 #if defined(OS_WIN)
138 // http://crbug.com/134570 - is flaky on Win7 perf bot
139 #define MAYBE_DOMCorePerf DISABLED_DOMCorePerf
140 #else
141 #define MAYBE_DOMCorePerf DOMCorePerf
142 #endif
143 TEST_F(DromaeoTest, MAYBE_DOMCorePerf) {
138 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo)) 144 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
139 return; 145 return;
140 146
141 RunTest("dom"); 147 RunTest("dom");
142 } 148 }
143 149
144 TEST_F(DromaeoTest, JSLibPerf) { 150 TEST_F(DromaeoTest, JSLibPerf) {
145 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo)) 151 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
146 return; 152 return;
147 153
148 RunTest("jslib"); 154 RunTest("jslib");
149 } 155 }
150 156
151 TEST_F(DromaeoReferenceTest, DOMCorePerf) { 157 TEST_F(DromaeoReferenceTest, MAYBE_DOMCorePerf) {
152 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo)) 158 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
153 return; 159 return;
154 160
155 RunTest("dom"); 161 RunTest("dom");
156 } 162 }
157 163
158 TEST_F(DromaeoReferenceTest, JSLibPerf) { 164 TEST_F(DromaeoReferenceTest, JSLibPerf) {
159 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo)) 165 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
160 return; 166 return;
161 167
162 RunTest("jslib"); 168 RunTest("jslib");
163 } 169 }
164 170
165 171
166 } // namespace 172 } // 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