diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 17:22:47 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 17:22:47 +0000 |
| commit | fdb47ce1d56d417bbbbe49e2e422cd846e925317 (patch) | |
| tree | 73f07e7621ad4f81d0dd446cf694dc93f85752e9 | |
| parent | 830042fd4310cb0d0a7a3231e45335cc9fedfc12 (diff) | |
| download | chromium_src-fdb47ce1d56d417bbbbe49e2e422cd846e925317.zip chromium_src-fdb47ce1d56d417bbbbe49e2e422cd846e925317.tar.gz chromium_src-fdb47ce1d56d417bbbbe49e2e422cd846e925317.tar.bz2 | |
Disable CompositingHugeDivSW on Mac Intel Release GPU bot.
BUG=114781
TEST=mac intel release bot:gpu_throughput_tests green
TBR=senorblanco
Review URL: https://chromiumcodereview.appspot.com/9425001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122524 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/perf/rendering/throughput_tests.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index f5135a2..b1ba2c22 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -437,7 +437,14 @@ IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasSingleImageGPU) { RunTest("canvas_single_image", kAllowExternalDNS); } -IN_PROC_BROWSER_TEST_F(ThroughputTestSW, CompositingHugeDivSW) { +// CompositingHugeDivSW timed out on Mac Intel Release GPU bot +// See crbug.com/114781 +#if defined(OS_MACOSX) +#define MAYBE_CompositingHugeDivSW DISABLED_CompositingHugeDivSW +#else +#define MAYBE_CompositingHugeDivSW CompositingHugeDivSW +#endif +IN_PROC_BROWSER_TEST_F(ThroughputTestSW, MAYBE_CompositingHugeDivSW) { RunTest("compositing_huge_div", kNone); } |