diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2017-09-21 09:25:04 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2017-09-21 15:06:17 +1000 |
| commit | 2346801b0e296e936cb383738ee88b76dfdad46c (patch) | |
| tree | 29c600649393ac48ef20f0aa05fdf5d23ac23e51 /test/litest-device-magic-trackpad.c | |
| parent | 5516e9ea74fad1fce35b151f4053114727544760 (diff) | |
| download | libinput-2346801b0e296e936cb383738ee88b76dfdad46c.tar.gz | |
test: switch to a TEST_DEVICE macro for all the litest test devices
The test device initialization code was a bit of duplicated boilerplate and
required adding a reference to the devices to the 'devices' list in litest.c.
Automate this with a new TEST_DEVICE macro that adds the devices to a custom
section in the binary, then loops throught that section to get the device out.
This reduces the boilerplate for each test device to just the TEST_MACRO and
the LITEST_foo device enum entry. It also now automates the shortname of the
device.
The device's shortname was standardised in this approach as well, lowercase
and dashes only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'test/litest-device-magic-trackpad.c')
| -rw-r--r-- | test/litest-device-magic-trackpad.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/test/litest-device-magic-trackpad.c b/test/litest-device-magic-trackpad.c index 56d42344..e569f4d9 100644 --- a/test/litest-device-magic-trackpad.c +++ b/test/litest-device-magic-trackpad.c @@ -26,12 +26,6 @@ #include "litest.h" #include "litest-int.h" -static void litest_magicpad_setup(void) -{ - struct litest_device *d = litest_create_device(LITEST_MAGIC_TRACKPAD); - litest_set_current_device(d); -} - static struct input_event down[] = { { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, @@ -121,12 +115,10 @@ static const char udev_rule[] = "\n" "LABEL=\"touchpad_end\""; -struct litest_test_device litest_magicpad_device = { +TEST_DEVICE("magic-trackpad", .type = LITEST_MAGIC_TRACKPAD, .features = LITEST_TOUCHPAD | LITEST_CLICKPAD | LITEST_BUTTON | LITEST_APPLE_CLICKPAD, - .shortname = "magic trackpad", - .setup = litest_magicpad_setup, .interface = &interface, .name = "Apple Wireless Trackpad", @@ -134,4 +126,4 @@ struct litest_test_device litest_magicpad_device = { .events = events, .absinfo = absinfo, .udev_rule = udev_rule, -}; +) |