test: disable hold gestures when are not required

Certain tests that make use of verify_left_handed_touch_motion can fail
depending on how quick they are executed, specially when using Valgrind.

Instead of ignoring the hold end event, use the existing mechanism to
disable hold gestures where we are not interested in them.

Signed-off-by: José Expósito <jose.exposito89@gmail.com>

diff --git a/test/test-tablet.c b/test/test-tablet.c
index d269878fa84a986cbf9b6c4d02027f19b13c89b9..0b68236504dc1f7862809aa2ed85f95beaf8f2fb 100644 (file)
--- a/test/test-tablet.c
+++ b/test/test-tablet.c
@@ -5392,13 +5392,7 @@ verify_left_handed_touch_motion(struct litest_device *finger,
        litest_touch_move_to(finger, 0, x + 1, y - 1, x + 20, y - 20, 10);
        libinput_dispatch(li);
 
-       /* Allow for optional hold gesture to end */
        event = libinput_get_event(li);
-       if (libinput_event_get_type(event) == LIBINPUT_EVENT_GESTURE_HOLD_END) {
-               libinput_event_destroy(event);
-               event = libinput_get_event(li);
-       }
-
        ck_assert_notnull(event);
 
        while (event) {
@@ -5466,6 +5460,7 @@ START_TEST(tablet_rotation_left_handed)
        enabled_from = tablet_from || touch_from;
        enabled_to   = tablet_to   || touch_to;
 
+       litest_disable_hold_gestures(finger->libinput_device);
        libinput_device_config_left_handed_set(tablet->libinput_device,
                                               tablet_from);
        libinput_device_config_left_handed_set(finger->libinput_device,
@@ -5571,6 +5566,7 @@ START_TEST(tablet_rotation_left_handed_while_in_prox)
        enabled_from = tablet_from || touch_from;
        enabled_to   = tablet_to   || touch_to;
 
+       litest_disable_hold_gestures(finger->libinput_device);
        libinput_device_config_left_handed_set(finger->libinput_device,
                                               touch_from);
        libinput_device_config_left_handed_set(tablet->libinput_device,
@@ -5664,6 +5660,7 @@ START_TEST(tablet_rotation_left_handed_while_touch_down)
        enabled_from = tablet_from || touch_from;
        enabled_to   = tablet_to   || touch_to;
 
+       litest_disable_hold_gestures(finger->libinput_device);
        libinput_device_config_left_handed_set(finger->libinput_device,
                                               touch_from);
        libinput_device_config_left_handed_set(tablet->libinput_device,