diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 19:08:16 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 19:08:16 +0000 |
| commit | ee31d93b73838a542403fb96f9190b5886615f6b (patch) | |
| tree | 8d75b56bc56f2cf89a5a06919678e8b1cff38c83 /content/browser/renderer_host | |
| parent | 65a8692322883bd4b46d6ee48c45626ca587aa59 (diff) | |
| download | chromium_src-ee31d93b73838a542403fb96f9190b5886615f6b.zip chromium_src-ee31d93b73838a542403fb96f9190b5886615f6b.tar.gz chromium_src-ee31d93b73838a542403fb96f9190b5886615f6b.tar.bz2 | |
Disable TouchActionBrowserTest.TouchActionNone under ThreadSanitizer v2.
BUG=357505
TBR=jdduke@chromium.org
Review URL: https://codereview.chromium.org/216313003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host')
| -rw-r--r-- | content/browser/renderer_host/input/touch_action_browsertest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/content/browser/renderer_host/input/touch_action_browsertest.cc b/content/browser/renderer_host/input/touch_action_browsertest.cc index 46d693e..9c49ca2 100644 --- a/content/browser/renderer_host/input/touch_action_browsertest.cc +++ b/content/browser/renderer_host/input/touch_action_browsertest.cc @@ -189,9 +189,16 @@ IN_PROC_BROWSER_TEST_F(TouchActionBrowserTest, DISABLED_DefaultAuto) { } } +// TouchActionBrowserTest.TouchActionNone fails under ThreadSanitizer v2, +// see http://crbug.com/357505. +#if defined(THREAD_SANITIZER) +#define MAYBE_TouchActionNone DISABLED_TouchActionNone +#else +#define MAYBE_TouchActionNone TouchActionNone +#endif // Verify that touching a touch-action: none region disables scrolling and // enables all touch events to be sent. -IN_PROC_BROWSER_TEST_F(TouchActionBrowserTest, TouchActionNone) { +IN_PROC_BROWSER_TEST_F(TouchActionBrowserTest, MAYBE_TouchActionNone) { LoadURL(); bool scrolled = DoTouchScroll(gfx::Point(50, 150), gfx::Vector2d(0, 45)); |