test: move main() into litest

This allows us to filter things based on argv before setting up tests, etc.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/test/device.c b/test/device.c
index 22569d26096ad7bbfd315123365adcda8eccc120..c44efabcbf0cacf0ac6a4e33575727c28ad75ad8 100644 (file)
--- a/test/device.c
+++ b/test/device.c
@@ -946,7 +946,8 @@ START_TEST(device_wheel_only)
 }
 END_TEST
 
-int main (int argc, char **argv)
+void
+litest_setup_tests(void)
 {
        struct range abs_range = { 0, ABS_MISC };
        struct range abs_mt_range = { ABS_MT_SLOT + 1, ABS_CNT };
@@ -987,6 +988,4 @@ int main (int argc, char **argv)
        litest_add_no_device("device:invalid devices", abs_mt_device_missing_res);
 
        litest_add("device:wheel", device_wheel_only, LITEST_WHEEL, LITEST_RELATIVE|LITEST_ABSOLUTE);
-
-       return litest_run(argc, argv);
 }

diff --git a/test/keyboard.c b/test/keyboard.c
index 03d62dddf857c0be343aaa48472df53cb86dc8bb..1c8092b5008a4304ddb302dbba7edbee0a4d0039 100644 (file)
--- a/test/keyboard.c
+++ b/test/keyboard.c
@@ -310,14 +310,12 @@ START_TEST(keyboard_keys_bad_device)
 }
 END_TEST
 
-int
-main(int argc, char **argv)
+void
+litest_setup_tests(void)
 {
        litest_add_no_device("keyboard:seat key count", keyboard_seat_key_count);
        litest_add_no_device("keyboard:key counting", keyboard_ignore_no_pressed_release);
        litest_add_no_device("keyboard:key counting", keyboard_key_auto_release);
        litest_add("keyboard:keys", keyboard_has_key, LITEST_KEYS, LITEST_ANY);
        litest_add("keyboard:keys", keyboard_keys_bad_device, LITEST_ANY, LITEST_ANY);
-
-       return litest_run(argc, argv);
 }

diff --git a/test/litest.c b/test/litest.c
index f637d4ef65778ec672fb6cbd826d043c784a4da1..c0b515b1ebb98b7b63a4110bc1642a65f9091dd7 100644 (file)
--- a/test/litest.c
+++ b/test/litest.c
@@ -462,7 +462,7 @@ static const struct option opts[] = {
        { 0, 0, 0, 0}
 };
 
-int
+static int
 litest_run(int argc, char **argv)
 {
        struct suite *s, *snext;
@@ -1886,3 +1886,11 @@ litest_semi_mt_touch_up(struct litest_device *d,
 
        litest_event(d, EV_SYN, SYN_REPORT, 0);
 }
+
+int
+main(int argc, char **argv)
+{
+       litest_setup_tests();
+
+       return litest_run(argc, argv);
+}

diff --git a/test/litest.h b/test/litest.h
index 38d3c1b6d07f2fbb511b1a498fedabcf62a3be4c..b6aaa6f5d0532dadca2c01bdac7d1b92ecca9348 100644 (file)
--- a/test/litest.h
+++ b/test/litest.h
@@ -130,7 +130,7 @@ void litest_add_ranged_no_device(const char *name,
                                 void *func,
                                 const struct range *range);
 
-int litest_run(int argc, char **argv);
+extern void litest_setup_tests(void);
 struct litest_device * litest_create_device(enum litest_device_type which);
 struct litest_device * litest_add_device(struct libinput *libinput,
                                         enum litest_device_type which);

diff --git a/test/log.c b/test/log.c
index 4eb554dd97a3e585adda5d805433ac086aaa9d5b..504f4c8dcaf1abe676c6ec1a3b67c6def41b15de 100644 (file)
--- a/test/log.c
+++ b/test/log.c
@@ -139,12 +139,11 @@ START_TEST(log_priority)
 }
 END_TEST
 
-int main (int argc, char **argv)
+void
+litest_setup_tests(void)
 {
        litest_add_no_device("log:defaults", log_default_priority);
        litest_add_no_device("log:logging", log_handler_invoked);
        litest_add_no_device("log:logging", log_handler_NULL);
        litest_add_no_device("log:logging", log_priority);
-
-       return litest_run(argc, argv);
 }

diff --git a/test/misc.c b/test/misc.c
index e9d546229008b76f1a6890d6f3f941fa013aca10..ec6d820a1800ff283fe580860bba06d0c79c9430 100644 (file)
--- a/test/misc.c
+++ b/test/misc.c
@@ -583,7 +583,8 @@ START_TEST(trackpoint_accel_parser)
 }
 END_TEST
 
-int main (int argc, char **argv)
+void
+litest_setup_tests(void)
 {
        litest_add_no_device("events:conversion", event_conversion_device_notify);
        litest_add_for_device("events:conversion", event_conversion_pointer, LITEST_MOUSE);
@@ -600,6 +601,4 @@ int main (int argc, char **argv)
        litest_add_no_device("misc:dpi parser", dpi_parser);
        litest_add_no_device("misc:wheel click parser", wheel_click_parser);
        litest_add_no_device("misc:trackpoint accel parser", trackpoint_accel_parser);
-
-       return litest_run(argc, argv);
 }

diff --git a/test/path.c b/test/path.c
index df649da61a0a67315ebb7bdc2b7122c9dd36deaa..c28c6ff4e3a76a1565b529ded596e2c081d28df5 100644 (file)
--- a/test/path.c
+++ b/test/path.c
@@ -874,8 +874,8 @@ START_TEST(path_seat_recycle)
 }
 END_TEST
 
-int
-main(int argc, char **argv)
+void
+litest_setup_tests(void)
 {
        litest_add_no_device("path:create", path_create_NULL);
        litest_add_no_device("path:create", path_create_invalid);
@@ -896,6 +896,4 @@ main(int argc, char **argv)
        litest_add_for_device("path:device events", path_remove_device, LITEST_SYNAPTICS_CLICKPAD);
        litest_add_for_device("path:device events", path_double_remove_device, LITEST_SYNAPTICS_CLICKPAD);
        litest_add_no_device("path:seat", path_seat_recycle);
-
-       return litest_run(argc, argv);
 }

diff --git a/test/pointer.c b/test/pointer.c
index cbc38023fd47987c3584c891c7a655e9c5d22641..22a4f3c04e13d78a4240e4fa4592e66dd5fdc886 100644 (file)
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -1261,7 +1261,8 @@ START_TEST(middlebutton_default_disabled)
 }
 END_TEST
 
-int main (int argc, char **argv)
+void
+litest_setup_tests(void)
 {
        litest_add("pointer:motion", pointer_motion_relative, LITEST_RELATIVE, LITEST_ANY);
        litest_add("pointer:motion", pointer_motion_absolute, LITEST_ABSOLUTE, LITEST_ANY);
@@ -1299,6 +1300,4 @@ int main (int argc, char **argv)
        litest_add("pointer:middlebutton", middlebutton_default_clickpad, LITEST_CLICKPAD, LITEST_ANY);
        litest_add("pointer:middlebutton", middlebutton_default_touchpad, LITEST_TOUCHPAD, LITEST_CLICKPAD);
        litest_add("pointer:middlebutton", middlebutton_default_disabled, LITEST_ANY, LITEST_BUTTON);
-
-       return litest_run(argc, argv);
 }

diff --git a/test/touch.c b/test/touch.c
index d78deedd07f6382770363c1c781d5b2bb4745537..1d2d9e5bd9c62ba73d33b5e88f4312d564385ce9 100644 (file)
--- a/test/touch.c
+++ b/test/touch.c
@@ -582,8 +582,8 @@ START_TEST(touch_protocol_a_2fg_touch)
 }
 END_TEST
 
-int
-main(int argc, char **argv)
+void
+litest_setup_tests(void)
 {
        litest_add("touch:frame", touch_frame_events, LITEST_TOUCH, LITEST_ANY);
        litest_add_no_device("touch:abs-transform", touch_abs_transform);
@@ -604,6 +604,4 @@ main(int argc, char **argv)
        litest_add("touch:protocol a", touch_protocol_a_init, LITEST_PROTOCOL_A, LITEST_ANY);
        litest_add("touch:protocol a", touch_protocol_a_touch, LITEST_PROTOCOL_A, LITEST_ANY);
        litest_add("touch:protocol a", touch_protocol_a_2fg_touch, LITEST_PROTOCOL_A, LITEST_ANY);
-
-       return litest_run(argc, argv);
 }

diff --git a/test/touchpad.c b/test/touchpad.c
index f7f9dd5af8e5339dd1018ced6c059a33d2602265..222735655192f083e022cd8085addf019ad07628 100644 (file)
--- a/test/touchpad.c
+++ b/test/touchpad.c
@@ -4530,7 +4530,8 @@ START_TEST(touchpad_trackpoint_no_trackpoint)
 }
 END_TEST
 
-int main(int argc, char **argv)
+void
+litest_setup_tests(void)
 {
        struct range multitap_range = {3, 8};
 
@@ -4674,6 +4675,4 @@ int main(int argc, char **argv)
        litest_add_for_device("touchpad:trackpoint", touchpad_trackpoint_buttons_softbuttons, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS);
        litest_add_for_device("touchpad:trackpoint", touchpad_trackpoint_buttons_2fg_scroll, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS);
        litest_add_for_device("touchpad:trackpoint", touchpad_trackpoint_no_trackpoint, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS);
-
-       return litest_run(argc, argv);
 }

diff --git a/test/trackpoint.c b/test/trackpoint.c
index ac6173e4d65c7068ab556c505f7ad9555f231b3d..9fcce6f7fd40c1d6b00c0d61f67b64c2fdc3fee6 100644 (file)
--- a/test/trackpoint.c
+++ b/test/trackpoint.c
@@ -130,12 +130,11 @@ START_TEST(trackpoint_scroll_source)
 }
 END_TEST
 
-int main(int argc, char **argv)
+void
+litest_setup_tests(void)
 {
        litest_add("trackpoint:middlebutton", trackpoint_middlebutton, LITEST_POINTINGSTICK, LITEST_ANY);
        litest_add("trackpoint:middlebutton", trackpoint_middlebutton_noscroll, LITEST_POINTINGSTICK, LITEST_ANY);
        litest_add("trackpoint:scroll", trackpoint_scroll, LITEST_POINTINGSTICK, LITEST_ANY);
        litest_add("trackpoint:scroll", trackpoint_scroll_source, LITEST_POINTINGSTICK, LITEST_ANY);
-
-       return litest_run(argc, argv);
 }

diff --git a/test/udev.c b/test/udev.c
index c351bed57e8413a0ed93073d1d67dd5bbe5b1b32..4ec956bc9696276a1032293ad3769f2d8f38a7db 100644 (file)
--- a/test/udev.c
+++ b/test/udev.c
@@ -502,8 +502,8 @@ START_TEST(udev_seat_recycle)
 }
 END_TEST
 
-int
-main(int argc, char **argv)
+void
+litest_setup_tests(void)
 {
        litest_add_no_device("udev:create", udev_create_NULL);
        litest_add_no_device("udev:create", udev_create_seat0);
@@ -518,6 +518,4 @@ main(int argc, char **argv)
        litest_add_for_device("udev:suspend", udev_suspend_resume, LITEST_SYNAPTICS_CLICKPAD);
        litest_add_for_device("udev:device events", udev_device_sysname, LITEST_SYNAPTICS_CLICKPAD);
        litest_add_for_device("udev:seat", udev_seat_recycle, LITEST_SYNAPTICS_CLICKPAD);
-
-       return litest_run(argc, argv);
 }