test: use a single litest_timeout function only

This can be easily wrapped with a macro that passes in the millis to
time out for.

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1169>
This commit is contained in:
Peter Hutterer 2025-04-01 11:02:06 +10:00 committed by Marge Bot
parent b43abaeacb
commit 734ffea934
2 changed files with 23 additions and 173 deletions

View file

@ -4765,123 +4765,9 @@ litest_assert_touch_cancel(struct libinput *li)
}
void
litest_timeout_tap(void)
litest_timeout(int millis)
{
msleep(300);
}
void
litest_timeout_tapndrag(void)
{
msleep(520);
}
void
litest_timeout_debounce(void)
{
msleep(30);
}
void
litest_timeout_softbuttons(void)
{
msleep(300);
}
void
litest_timeout_buttonscroll(void)
{
msleep(300);
}
void
litest_timeout_finger_switch(void)
{
msleep(140);
}
void
litest_timeout_wheel_scroll(void)
{
msleep(600);
}
void
litest_timeout_edgescroll(void)
{
msleep(300);
}
void
litest_timeout_middlebutton(void)
{
msleep(70);
}
void
litest_timeout_dwt_short(void)
{
msleep(220);
}
void
litest_timeout_dwt_long(void)
{
msleep(520);
}
void
litest_timeout_gesture(void)
{
msleep(120);
}
void
litest_timeout_gesture_scroll(void)
{
msleep(180);
}
void
litest_timeout_gesture_hold(void)
{
msleep(300);
}
void
litest_timeout_gesture_quick_hold(void)
{
msleep(60);
}
void
litest_timeout_trackpoint(void)
{
msleep(320);
}
void
litest_timeout_tablet_proxout(void)
{
msleep(170);
}
void
litest_timeout_touch_arbitration(void)
{
msleep(100);
}
void
litest_timeout_hysteresis(void)
{
msleep(90);
}
void
litest_timeout_3fg_drag(void)
{
msleep(800);
msleep(millis);
}
void

View file

@ -1256,64 +1256,28 @@ litest_create_uinput_abs_device(const char *name,
...);
void
litest_timeout_tap(void);
litest_timeout(int millis);
void
litest_timeout_tapndrag(void);
void
litest_timeout_debounce(void);
void
litest_timeout_softbuttons(void);
void
litest_timeout_buttonscroll(void);
void
litest_timeout_wheel_scroll(void);
void
litest_timeout_edgescroll(void);
void
litest_timeout_finger_switch(void);
void
litest_timeout_middlebutton(void);
void
litest_timeout_dwt_short(void);
void
litest_timeout_dwt_long(void);
void
litest_timeout_gesture(void);
void
litest_timeout_gesture_scroll(void);
void
litest_timeout_gesture_hold(void);
void
litest_timeout_gesture_quick_hold(void);
void
litest_timeout_trackpoint(void);
void
litest_timeout_tablet_proxout(void);
void
litest_timeout_touch_arbitration(void);
void
litest_timeout_hysteresis(void);
void
litest_timeout_3fg_drag(void);
#define litest_timeout_tap() litest_timeout(300)
#define litest_timeout_tapndrag() litest_timeout(520)
#define litest_timeout_debounce() litest_timeout(30)
#define litest_timeout_softbuttons() litest_timeout(300)
#define litest_timeout_buttonscroll() litest_timeout(300)
#define litest_timeout_wheel_scroll() litest_timeout(600)
#define litest_timeout_edgescroll() litest_timeout(300)
#define litest_timeout_finger_switch() litest_timeout(140)
#define litest_timeout_middlebutton() litest_timeout(70)
#define litest_timeout_dwt_short() litest_timeout(220)
#define litest_timeout_dwt_long() litest_timeout(520)
#define litest_timeout_gesture() litest_timeout(120)
#define litest_timeout_gesture_scroll() litest_timeout(180)
#define litest_timeout_gesture_hold() litest_timeout(300)
#define litest_timeout_gesture_quick_hold() litest_timeout(60)
#define litest_timeout_trackpoint() litest_timeout(320)
#define litest_timeout_tablet_proxout() litest_timeout(170)
#define litest_timeout_touch_arbitration() litest_timeout(100)
#define litest_timeout_hysteresis() litest_timeout(90)
#define litest_timeout_3fg_drag() litest_timeout(800)
void
litest_push_event_frame(struct litest_device *dev);