summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2014-07-15 16:32:33 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2014-07-21 08:56:12 +1000
commit475665efdf21641d5f18c02c3862138197c33466 (patch)
tree9d1c36b42416b56ba57f84da87504bd5d07854b2
parent489630f58b2ac099bf235efc5dfd9cd854c223ee (diff)
downloadlibinput-475665efdf21641d5f18c02c3862138197c33466.tar.gz
test: reduce sideways-component in two-finger scroll test
This breaks when we have a device resolution set on the test devices, specificially on the T440. The current tests use a delta of 1% of the device which with the resolution set results in an effective delta of 3 - above the scroll threshold. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--test/touchpad.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/test/touchpad.c b/test/touchpad.c
index 3bd5fb67..bd5d71eb 100644
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -1198,15 +1198,13 @@ START_TEST(touchpad_2fg_scroll)
litest_drain_events(li);
- /* Note this mixes in a tiny amount of movement in the wrong direction,
- which should be ignored */
- test_2fg_scroll(dev, 1, 40, 0);
+ test_2fg_scroll(dev, 0.1, 40, 0);
check_2fg_scroll(dev, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 10);
- test_2fg_scroll(dev, 1, -40, 0);
+ test_2fg_scroll(dev, 0.1, -40, 0);
check_2fg_scroll(dev, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, -10);
- test_2fg_scroll(dev, 40, 1, 0);
+ test_2fg_scroll(dev, 40, 0.1, 0);
check_2fg_scroll(dev, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, 10);
- test_2fg_scroll(dev, -40, 1, 0);
+ test_2fg_scroll(dev, -40, 0.1, 0);
check_2fg_scroll(dev, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, -10);
/* 2fg scroll smaller than the threshold should not generate events */