summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-24 16:51:58 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-24 16:51:58 +0000
commite66ddfac77aec940f545a3edb41e1488b9ece579 (patch)
tree1170f9578e19cf11db392ee4a9e8c30327ff78fb
parent1bc3ef056eb9fd5bd5b8f479a7b839df5f7be8dd (diff)
downloadchromium_src-e66ddfac77aec940f545a3edb41e1488b9ece579.zip
chromium_src-e66ddfac77aec940f545a3edb41e1488b9ece579.tar.gz
chromium_src-e66ddfac77aec940f545a3edb41e1488b9ece579.tar.bz2
Disable GestureRecognizerTest.GestureEventLongPress on Windows
BUG=157596 Review URL: https://codereview.chromium.org/11260020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163850 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/aura/gestures/gesture_recognizer_unittest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc
index adc6419..4dd423a 100644
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
@@ -1026,8 +1026,15 @@ TEST_F(GestureRecognizerTest, GestureEventNonRailFling) {
EXPECT_GT(delegate->velocity_y(), 0);
}
+#if defined(OS_WIN)
+// Fails on win_aura. http://crbug.com/157596
+#define MAYBE_GestureEventLongPress DISABLED_GestureEventLongPress
+#else
+#define MAYBE_GestureEventLongPress GestureEventLongPress
+#endif
+
// Check that appropriate touch events generate long press events
-TEST_F(GestureRecognizerTest, GestureEventLongPress) {
+TEST_F(GestureRecognizerTest, MAYBE_GestureEventLongPress) {
scoped_ptr<GestureEventConsumeDelegate> delegate(
new GestureEventConsumeDelegate());
const int kWindowWidth = 123;