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

Side by Side Diff: chrome/test/perf/frame_rate/frame_rate_tests.cc

Issue 8823004: Disable fishbowl framerate test to turn GPU bots green. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <map> 5 #include <map>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 } 267 }
268 268
269 INSTANTIATE_TEST_CASE_P(, FrameRateNoVsyncCanvasInternalTest, ::testing::Values( 269 INSTANTIATE_TEST_CASE_P(, FrameRateNoVsyncCanvasInternalTest, ::testing::Values(
270 kInternal | kHasRedirect, 270 kInternal | kHasRedirect,
271 kInternal | kHasRedirect | kUseGpu, 271 kInternal | kHasRedirect | kUseGpu,
272 kInternal | kHasRedirect | kUseGpu | kDisableVsync, 272 kInternal | kHasRedirect | kUseGpu | kDisableVsync,
273 kUseReferenceBuild | kInternal | kHasRedirect, 273 kUseReferenceBuild | kInternal | kHasRedirect,
274 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu, 274 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
275 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | kDisableVsync)); 275 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | kDisableVsync));
276 276
277 INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(fishbowl) 277 INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(DISABLED_fishbowl)
278 278
279 typedef FrameRateTest FrameRateGpuCanvasInternalTest; 279 typedef FrameRateTest FrameRateGpuCanvasInternalTest;
280 280
281 // Tests for animated 2D canvas content to be tested only with GPU 281 // Tests for animated 2D canvas content to be tested only with GPU
282 // acceleration. 282 // acceleration.
283 // tests are run with and without Vsync 283 // tests are run with and without Vsync
284 #define INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(content) \ 284 #define INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(content) \
285 TEST_P(FrameRateGpuCanvasInternalTest, content) { \ 285 TEST_P(FrameRateGpuCanvasInternalTest, content) { \
286 RunTest(#content); \ 286 RunTest(#content); \
287 } 287 }
288 288
289 INSTANTIATE_TEST_CASE_P(, FrameRateGpuCanvasInternalTest, ::testing::Values( 289 INSTANTIATE_TEST_CASE_P(, FrameRateGpuCanvasInternalTest, ::testing::Values(
290 kInternal | kHasRedirect | kUseGpu, 290 kInternal | kHasRedirect | kUseGpu,
291 kInternal | kHasRedirect | kUseGpu | kDisableVsync, 291 kInternal | kHasRedirect | kUseGpu | kDisableVsync,
292 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu, 292 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
293 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | kDisableVsync)); 293 kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | kDisableVsync));
294 294
295 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies) 295 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies)
296 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE) 296 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE)
297 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading) 297 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading)
298 298
299 } // namespace 299 } // 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