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

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

Issue 9969124: Disabled failing tests: WebGLAllowed and Canvas2DAllowed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); 185 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
186 } 186 }
187 }; 187 };
188 188
189 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest, 189 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest,
190 AcceleratedCompositingDisabled) { 190 AcceleratedCompositingDisabled) {
191 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); 191 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
192 RunTest(url, EXPECT_NO_GPU_PROCESS); 192 RunTest(url, EXPECT_NO_GPU_PROCESS);
193 } 193 }
194 194
195 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) { 195 // Fails on all platforms: crbug.com/121748 .
196 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, DISABLED_WebGLAllowed) {
196 GpuFeatureType type = GpuDataManager::GetInstance()->GetGpuFeatureType(); 197 GpuFeatureType type = GpuDataManager::GetInstance()->GetGpuFeatureType();
197 EXPECT_EQ(type, 0); 198 EXPECT_EQ(type, 0);
198 199
199 const FilePath url(FILE_PATH_LITERAL("feature_webgl.html")); 200 const FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
200 RunTest(url, EXPECT_GPU_SWAP_BUFFERS); 201 RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
201 } 202 }
202 203
203 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) { 204 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) {
204 const std::string json_blacklist = 205 const std::string json_blacklist =
205 "{\n" 206 "{\n"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 } 295 }
295 296
296 class Canvas2DEnabledTest : public GpuFeatureTest { 297 class Canvas2DEnabledTest : public GpuFeatureTest {
297 public: 298 public:
298 virtual void SetUpCommandLine(CommandLine* command_line) { 299 virtual void SetUpCommandLine(CommandLine* command_line) {
299 GpuFeatureTest::SetUpCommandLine(command_line); 300 GpuFeatureTest::SetUpCommandLine(command_line);
300 command_line->AppendSwitch(switches::kEnableAccelerated2dCanvas); 301 command_line->AppendSwitch(switches::kEnableAccelerated2dCanvas);
301 } 302 }
302 }; 303 };
303 304
304 IN_PROC_BROWSER_TEST_F(Canvas2DEnabledTest, Canvas2DAllowed) { 305 // Fails on all platforms: crbug.com/121748 .
306 IN_PROC_BROWSER_TEST_F(Canvas2DEnabledTest, DISABLED_Canvas2DAllowed) {
305 #if defined(OS_WIN) 307 #if defined(OS_WIN)
306 // Accelerated canvas 2D is not supported on XP. 308 // Accelerated canvas 2D is not supported on XP.
307 GPUTestBotConfig test_bot; 309 GPUTestBotConfig test_bot;
308 test_bot.LoadCurrentConfig(NULL); 310 test_bot.LoadCurrentConfig(NULL);
309 if (test_bot.os() == GPUTestConfig::kOsWinXP) 311 if (test_bot.os() == GPUTestConfig::kOsWinXP)
310 return; 312 return;
311 #endif 313 #endif
312 314
313 GpuFeatureType type = GpuDataManager::GetInstance()->GetGpuFeatureType(); 315 GpuFeatureType type = GpuDataManager::GetInstance()->GetGpuFeatureType();
314 EXPECT_EQ(type, 0); 316 EXPECT_EQ(type, 0);
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 EXPECT_GT(stats.mean_us, 15000.0); 406 EXPECT_GT(stats.mean_us, 15000.0);
405 407
406 // Print out the trace events upon error to debug failures. 408 // Print out the trace events upon error to debug failures.
407 if (stats.mean_us <= 15000.0) { 409 if (stats.mean_us <= 15000.0) {
408 fprintf(stderr, "\n\nTRACE JSON:\n\n%s\n\n", trace_events_json_.c_str()); 410 fprintf(stderr, "\n\nTRACE JSON:\n\n%s\n\n", trace_events_json_.c_str());
409 } 411 }
410 } 412 }
411 413
412 } // namespace anonymous 414 } // namespace anonymous
413 415
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