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

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

Issue 10736019: Marked GpuPixelBrowserTest::CSS3DBlueBox as flaky on windows. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 DISALLOW_COPY_AND_ASSIGN(GpuPixelBrowserTest); 452 DISALLOW_COPY_AND_ASSIGN(GpuPixelBrowserTest);
453 }; 453 };
454 454
455 // http://crbug.com/ 455 // http://crbug.com/
456 #if defined(OS_WIN) 456 #if defined(OS_WIN)
457 #define MAYBE_WebGLGreenTriangle DISABLED_WebGLGreenTriangle 457 #define MAYBE_WebGLGreenTriangle DISABLED_WebGLGreenTriangle
458 #else 458 #else
459 #define MAYBE_WebGLGreenTriangle WebGLGreenTriangle 459 #define MAYBE_WebGLGreenTriangle WebGLGreenTriangle
460 #endif 460 #endif
461 461
462 // http://crbug.com/136430
463 #if defined(OS_WIN)
464 #define MAYBE_CSS3DBlueBox FLAKY_CSS3DBlueBox
465 #else
466 #define MAYBE_CSS3DBlueBox CSS3DBlueBox
467 #endif
468
462 IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, MAYBE_WebGLGreenTriangle) { 469 IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, MAYBE_WebGLGreenTriangle) {
463 // If test baseline needs to be updated after a given revision, update the 470 // If test baseline needs to be updated after a given revision, update the
464 // following number. If no revision requirement, then 0. 471 // following number. If no revision requirement, then 0.
465 const int64 ref_img_revision_update = 123489; 472 const int64 ref_img_revision_update = 123489;
466 473
467 gfx::Size container_size(400, 300); 474 gfx::Size container_size(400, 300);
468 FilePath url = 475 FilePath url =
469 test_data_dir().AppendASCII("pixel_webgl.html"); 476 test_data_dir().AppendASCII("pixel_webgl.html");
470 RunPixelTest(container_size, url, ref_img_revision_update); 477 RunPixelTest(container_size, url, ref_img_revision_update);
471 } 478 }
472 479
473 IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, CSS3DBlueBox) { 480 IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, MAYBE_CSS3DBlueBox) {
474 // If test baseline needs to be updated after a given revision, update the 481 // If test baseline needs to be updated after a given revision, update the
475 // following number. If no revision requirement, then 0. 482 // following number. If no revision requirement, then 0.
476 const int64 ref_img_revision_update = 123489; 483 const int64 ref_img_revision_update = 123489;
477 484
478 gfx::Size container_size(400, 300); 485 gfx::Size container_size(400, 300);
479 FilePath url = 486 FilePath url =
480 test_data_dir().AppendASCII("pixel_css3d.html"); 487 test_data_dir().AppendASCII("pixel_css3d.html");
481 RunPixelTest(container_size, url, ref_img_revision_update); 488 RunPixelTest(container_size, url, ref_img_revision_update);
482 } 489 }
483 490
(...skipping 19 matching lines...) Expand all
503 IN_PROC_BROWSER_TEST_F(Canvas2DPixelTestSD, Canvas2DRedBoxSD) { 510 IN_PROC_BROWSER_TEST_F(Canvas2DPixelTestSD, Canvas2DRedBoxSD) {
504 // If test baseline needs to be updated after a given revision, update the 511 // If test baseline needs to be updated after a given revision, update the
505 // following number. If no revision requirement, then 0. 512 // following number. If no revision requirement, then 0.
506 const int64 ref_img_revision_update = 123489; 513 const int64 ref_img_revision_update = 123489;
507 514
508 gfx::Size container_size(400, 300); 515 gfx::Size container_size(400, 300);
509 FilePath url = 516 FilePath url =
510 test_data_dir().AppendASCII("pixel_canvas2d.html"); 517 test_data_dir().AppendASCII("pixel_canvas2d.html");
511 RunPixelTest(container_size, url, ref_img_revision_update); 518 RunPixelTest(container_size, url, ref_img_revision_update);
512 } 519 }
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