From 0d5bbfb07a69dd0d904ab0555b517c81aadd92a2 Mon Sep 17 00:00:00 2001 From: Dominic Battre Date: Mon, 4 Jun 2018 10:55:53 +0000 Subject: [PATCH] Disable LayerTreeHostScrollbarsPixelTest.HugeTransformScale on TSan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable the test on TSan builders due to frequent timeouts. TBR=danakj@chromium.org Bug: 848994 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel Change-Id: I6ddeb111e2ee2432b958b6981ab4099e8e1c89b3 Reviewed-on: https://chromium-review.googlesource.com/1084830 Commit-Queue: Dominic Battré Reviewed-by: Dominic Battré Cr-Commit-Position: refs/heads/master@{#564052} --- cc/trees/layer_tree_host_pixeltest_scrollbars.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cc/trees/layer_tree_host_pixeltest_scrollbars.cc b/cc/trees/layer_tree_host_pixeltest_scrollbars.cc index b251df562abd02..f218c5a49eeb63 100644 --- a/cc/trees/layer_tree_host_pixeltest_scrollbars.cc +++ b/cc/trees/layer_tree_host_pixeltest_scrollbars.cc @@ -137,7 +137,13 @@ TEST_F(LayerTreeHostScrollbarsPixelTest, TransformScale) { base::FilePath(FILE_PATH_LITERAL("spiral_double_scale.png"))); } -TEST_F(LayerTreeHostScrollbarsPixelTest, HugeTransformScale) { +// Disabled on TSan due to frequent timeouts. crbug.com/848994 +#if defined(THREAD_SANITIZER) +#define MAYBE_HugeTransformScale DISABLED_HugeTransformScale +#else +#define MAYBE_HugeTransformScale HugeTransformScale +#endif +TEST_F(LayerTreeHostScrollbarsPixelTest, MAYBE_HugeTransformScale) { scoped_refptr background = CreateSolidColorLayer(gfx::Rect(400, 400), SK_ColorWHITE);