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

Side by Side Diff: chrome/test/gpu/gpu_feature_browsertest.cc

Issue 10094004: Disable failing test after WebKit roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 8 years, 8 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_util.h" 6 #include "base/file_util.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/test/trace_event_analyzer.h" 9 #include "base/test/trace_event_analyzer.h"
10 #include "base/version.h" 10 #include "base/version.h"
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 } 385 }
386 386
387 class ThreadedCompositorTest : public GpuFeatureTest { 387 class ThreadedCompositorTest : public GpuFeatureTest {
388 public: 388 public:
389 virtual void SetUpCommandLine(CommandLine* command_line) { 389 virtual void SetUpCommandLine(CommandLine* command_line) {
390 GpuFeatureTest::SetUpCommandLine(command_line); 390 GpuFeatureTest::SetUpCommandLine(command_line);
391 command_line->AppendSwitch(switches::kEnableThreadedCompositing); 391 command_line->AppendSwitch(switches::kEnableThreadedCompositing);
392 } 392 }
393 }; 393 };
394 394
395 IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, ThreadedCompositor) { 395 // disabled in http://crbug.com/123503
396 IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, DISABLED_ThreadedCompositor) {
396 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); 397 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
397 RunTest(url, EXPECT_GPU_SWAP_BUFFERS); 398 RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
398 } 399 }
399 400
400 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, RafNoDamage) { 401 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, RafNoDamage) {
401 trace_categories_ = "-test_*"; 402 trace_categories_ = "-test_*";
402 const FilePath url(FILE_PATH_LITERAL("feature_raf_no_damage.html")); 403 const FilePath url(FILE_PATH_LITERAL("feature_raf_no_damage.html"));
403 RunTest(url, GpuResultFlags(0)); 404 RunTest(url, GpuResultFlags(0));
404 405
405 if (!analyzer_.get()) 406 if (!analyzer_.get())
(...skipping 18 matching lines...) Expand all
424 // indicate that the renderer is not simply spinning on RAF. 425 // indicate that the renderer is not simply spinning on RAF.
425 EXPECT_GT(stats.mean_us, 15000.0); 426 EXPECT_GT(stats.mean_us, 15000.0);
426 427
427 // Print out the trace events upon error to debug failures. 428 // Print out the trace events upon error to debug failures.
428 if (stats.mean_us <= 15000.0) { 429 if (stats.mean_us <= 15000.0) {
429 fprintf(stderr, "\n\nTRACE JSON:\n\n%s\n\n", trace_events_json_.c_str()); 430 fprintf(stderr, "\n\nTRACE JSON:\n\n%s\n\n", trace_events_json_.c_str());
430 } 431 }
431 } 432 }
432 433
433 } // namespace anonymous 434 } // namespace anonymous
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