diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 18:55:07 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 18:55:07 +0000 |
| commit | 938944ba69b2b12e9c6fec4226d9f0429177b8b2 (patch) | |
| tree | c7565713cba9467c73e37a395346e107b46b40bc /content/browser/gpu/gpu_functional_browsertest.cc | |
| parent | 5496785cd4a16aca4c19a023a4c42f47f76cf90c (diff) | |
| download | chromium_src-938944ba69b2b12e9c6fec4226d9f0429177b8b2.zip chromium_src-938944ba69b2b12e9c6fec4226d9f0429177b8b2.tar.gz chromium_src-938944ba69b2b12e9c6fec4226d9f0429177b8b2.tar.bz2 | |
Disable browser tests that are timing out on Linux GPU debug bots
R=zmo@chromium.org
BUG=254724
Review URL: https://chromiumcodereview.appspot.com/18137002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_functional_browsertest.cc')
| -rw-r--r-- | content/browser/gpu/gpu_functional_browsertest.cc | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/content/browser/gpu/gpu_functional_browsertest.cc b/content/browser/gpu/gpu_functional_browsertest.cc index eb3f935..d4f8a51 100644 --- a/content/browser/gpu/gpu_functional_browsertest.cc +++ b/content/browser/gpu/gpu_functional_browsertest.cc @@ -96,30 +96,42 @@ class GpuFunctionalTest : public ContentBrowserTest { base::FilePath gpu_test_dir_; }; -IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, - MANUAL_TestFeatureHardwareAccelerated) { +#if defined(OS_LINUX) && !defined(NDEBUG) +// http://crbug.com/254724 +#define IF_NOT_DEBUG_LINUX(x) DISABLED_ ## x +#else +#define IF_NOT_DEBUG_LINUX(x) x +#endif + +IN_PROC_BROWSER_TEST_F( + GpuFunctionalTest, + IF_NOT_DEBUG_LINUX(MANUAL_TestFeatureHardwareAccelerated)) { VerifyHardwareAccelerated("WebGL: "); VerifyHardwareAccelerated("Canvas: "); VerifyHardwareAccelerated("3D CSS: "); } // Verify that gpu process is spawned in webgl example. -IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, MANUAL_TestWebGL) { +IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, + IF_NOT_DEBUG_LINUX(MANUAL_TestWebGL)) { VerifyGPUProcessOnPage("functional_webgl.html", false); } // Verify that gpu process is spawned when viewing a 2D canvas. -IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, MANUAL_Test2dCanvas) { +IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, + IF_NOT_DEBUG_LINUX(MANUAL_Test2dCanvas)) { VerifyGPUProcessOnPage("functional_canvas_demo.html", false); } // Verify that gpu process is spawned when viewing a 3D CSS page. -IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, MANUAL_Test3dCss) { +IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, + IF_NOT_DEBUG_LINUX(MANUAL_Test3dCss)) { VerifyGPUProcessOnPage("functional_3d_css.html", false); } // Verify that gpu process is started when viewing video. -IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, MANUAL_TestGpuWithVideo) { +IN_PROC_BROWSER_TEST_F(GpuFunctionalTest, + IF_NOT_DEBUG_LINUX(MANUAL_TestGpuWithVideo)) { VerifyGPUProcessOnPage("functional_video.html", true); } |