diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 08:41:43 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-15 08:41:43 +0000 |
| commit | ec10ac868788b39e4ecc311cca5b55eeb9ebb88a (patch) | |
| tree | c1fd78a29335bb0227565448c308e144a38e66bc /chrome/test/gpu | |
| parent | 4e540d73386f0777cf60f9bb8ea53d0c8bb69419 (diff) | |
| download | chromium_src-ec10ac868788b39e4ecc311cca5b55eeb9ebb88a.zip chromium_src-ec10ac868788b39e4ecc311cca5b55eeb9ebb88a.tar.gz chromium_src-ec10ac868788b39e4ecc311cca5b55eeb9ebb88a.tar.bz2 | |
Disable ThreadedCompositor.ThreadedCompositor
BUG=157985
TBR=jamesr
Review URL: https://codereview.chromium.org/12262062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
| -rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index 0a809f1..5dd2abd 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -441,13 +441,8 @@ class ThreadedCompositorTest : public GpuFeatureTest { } }; -#if defined(OS_LINUX) -// http://crbug.com/157985: test fails on Linux -#define MAYBE_ThreadedCompositor DISABLED_ThreadedCompositor -#else -#define MAYBE_ThreadedCompositor ThreadedCompositor -#endif -IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, MAYBE_ThreadedCompositor) { +// http://crbug.com/157985 +IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, DISABLED_ThreadedCompositor) { const base::FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); RunEventTest(url, kSwapBuffersEvent, true); } |