summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_unittest_damage.cc
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-16 03:16:18 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-16 03:16:18 +0000
commit4f65bc2a4a728769be622bb8ae279d2fdc83b1c7 (patch)
treedca012f0a316069133cfb8970bbac5f7223754af /cc/trees/layer_tree_host_unittest_damage.cc
parent7e0347d24c455ab57ad8161dd7fddab132399b04 (diff)
downloadchromium_src-4f65bc2a4a728769be622bb8ae279d2fdc83b1c7.zip
chromium_src-4f65bc2a4a728769be622bb8ae279d2fdc83b1c7.tar.gz
chromium_src-4f65bc2a4a728769be622bb8ae279d2fdc83b1c7.tar.bz2
Disable LayerTreeHostDamageTestScrollbarDoesDamage on windows.
BUG=274116,272361 TBR=danakj@chromium.org,enne@chromium.org,jbauman@chromium.org Review URL: https://codereview.chromium.org/22866011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217924 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_host_unittest_damage.cc')
-rw-r--r--cc/trees/layer_tree_host_unittest_damage.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc
index 805c927..9a5f3d2 100644
--- a/cc/trees/layer_tree_host_unittest_damage.cc
+++ b/cc/trees/layer_tree_host_unittest_damage.cc
@@ -385,7 +385,12 @@ class LayerTreeHostDamageTestScrollbarDoesDamage
int did_swaps_;
};
+// Flaky on win. http://crbug.com/274116
+// Can't specify the normal DISABLED_ since we don't have access to the test
+// names through this macro. Just ifdef it out completely.
+#if !defined(OS_WIN)
MULTI_THREAD_TEST_F(LayerTreeHostDamageTestScrollbarDoesDamage);
+#endif
} // namespace
} // namespace cc