From 38a562e48574166ab7ae754d853b9723e00dc7ff Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 9 Sep 2016 12:54:01 +1000 Subject: [PATCH] test: rename SYNAPTICS_CLICKPAD to SYNAPTICS_CLICKPAD_X220 That's where this device comes from. The x220 is special because it's too small to trigger some of the features, eg. palm detection. Make this more obvious by changing to a less generic name. Signed-off-by: Peter Hutterer --- test/device.c | 2 +- test/litest-device-synaptics.c | 4 ++-- test/litest.h | 2 +- test/path.c | 10 +++++----- test/touchpad.c | 10 +++++----- test/udev.c | 10 +++++----- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/test/device.c b/test/device.c index 68f9b8b5..4ed12d95 100644 --- a/test/device.c +++ b/test/device.c @@ -1448,7 +1448,7 @@ litest_setup_tests_device(void) litest_add("device:sendevents", device_disable_release_softbutton, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); litest_add("device:sendevents", device_disable_topsoftbutton, LITEST_TOPBUTTONPAD, LITEST_ANY); litest_add("device:id", device_ids, LITEST_ANY, LITEST_ANY); - litest_add_for_device("device:context", device_context, LITEST_SYNAPTICS_CLICKPAD); + litest_add_for_device("device:context", device_context, LITEST_SYNAPTICS_CLICKPAD_X220); litest_add("device:udev", device_get_udev_handle, LITEST_ANY, LITEST_ANY); diff --git a/test/litest-device-synaptics.c b/test/litest-device-synaptics.c index 4dcdebfd..3186a3ae 100644 --- a/test/litest-device-synaptics.c +++ b/test/litest-device-synaptics.c @@ -31,7 +31,7 @@ static void litest_synaptics_clickpad_setup(void) { - struct litest_device *d = litest_create_device(LITEST_SYNAPTICS_CLICKPAD); + struct litest_device *d = litest_create_device(LITEST_SYNAPTICS_CLICKPAD_X220); litest_set_current_device(d); } @@ -112,7 +112,7 @@ static struct input_absinfo absinfo[] = { }; struct litest_test_device litest_synaptics_clickpad_device = { - .type = LITEST_SYNAPTICS_CLICKPAD, + .type = LITEST_SYNAPTICS_CLICKPAD_X220, .features = LITEST_TOUCHPAD | LITEST_CLICKPAD | LITEST_BUTTON, .shortname = "synaptics", .setup = litest_synaptics_clickpad_setup, diff --git a/test/litest.h b/test/litest.h index d7a7327a..46023554 100644 --- a/test/litest.h +++ b/test/litest.h @@ -170,7 +170,7 @@ litest_fail_comparison_ptr(const char *file, enum litest_device_type { LITEST_NO_DEVICE = -1, - LITEST_SYNAPTICS_CLICKPAD = -1000, + LITEST_SYNAPTICS_CLICKPAD_X220 = -1000, LITEST_SYNAPTICS_TOUCHPAD, LITEST_SYNAPTICS_TOPBUTTONPAD, LITEST_BCM5974, diff --git a/test/path.c b/test/path.c index 221c1752..0890d3e0 100644 --- a/test/path.c +++ b/test/path.c @@ -952,13 +952,13 @@ litest_setup_tests_path(void) litest_add_no_device("path:suspend", path_add_device_suspend_resume); litest_add_no_device("path:suspend", path_add_device_suspend_resume_fail); litest_add_no_device("path:suspend", path_add_device_suspend_resume_remove_device); - litest_add_for_device("path:seat", path_added_seat, LITEST_SYNAPTICS_CLICKPAD); - litest_add_for_device("path:seat", path_seat_change, LITEST_SYNAPTICS_CLICKPAD); + litest_add_for_device("path:seat", path_added_seat, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device("path:seat", path_seat_change, LITEST_SYNAPTICS_CLICKPAD_X220); litest_add("path:device events", path_added_device, LITEST_ANY, LITEST_ANY); litest_add("path:device events", path_device_sysname, LITEST_ANY, LITEST_ANY); - litest_add_for_device("path:device events", path_add_device, LITEST_SYNAPTICS_CLICKPAD); + litest_add_for_device("path:device events", path_add_device, LITEST_SYNAPTICS_CLICKPAD_X220); litest_add_no_device("path:device events", path_add_invalid_path); - 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_for_device("path:device events", path_remove_device, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device("path:device events", path_double_remove_device, LITEST_SYNAPTICS_CLICKPAD_X220); litest_add_no_device("path:seat", path_seat_recycle); } diff --git a/test/touchpad.c b/test/touchpad.c index 48840b57..0169bd74 100644 --- a/test/touchpad.c +++ b/test/touchpad.c @@ -4745,10 +4745,10 @@ litest_setup_tests_touchpad(void) litest_add("touchpad:time", touchpad_time_usec, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_for_device("touchpad:jumps", touchpad_jump_finger_motion, LITEST_SYNAPTICS_CLICKPAD); + litest_add_for_device("touchpad:jumps", touchpad_jump_finger_motion, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("touchpad:sendevents", touchpad_disabled_on_mouse, LITEST_SYNAPTICS_CLICKPAD); - litest_add_for_device("touchpad:sendevents", touchpad_disabled_on_mouse_suspend_mouse, LITEST_SYNAPTICS_CLICKPAD); - litest_add_for_device("touchpad:sendevents", touchpad_disabled_double_mouse, LITEST_SYNAPTICS_CLICKPAD); - litest_add_for_device("touchpad:sendevents", touchpad_disabled_double_mouse_one_suspended, LITEST_SYNAPTICS_CLICKPAD); + litest_add_for_device("touchpad:sendevents", touchpad_disabled_on_mouse, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device("touchpad:sendevents", touchpad_disabled_on_mouse_suspend_mouse, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device("touchpad:sendevents", touchpad_disabled_double_mouse, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device("touchpad:sendevents", touchpad_disabled_double_mouse_one_suspended, LITEST_SYNAPTICS_CLICKPAD_X220); } diff --git a/test/udev.c b/test/udev.c index 5a74436b..ba6a10d9 100644 --- a/test/udev.c +++ b/test/udev.c @@ -517,9 +517,9 @@ litest_setup_tests_udev(void) litest_add_no_device("udev:seat", udev_added_seat_default); litest_add_no_device("udev:seat", udev_change_seat); - litest_add_for_device("udev:suspend", udev_double_suspend, LITEST_SYNAPTICS_CLICKPAD); - litest_add_for_device("udev:suspend", udev_double_resume, LITEST_SYNAPTICS_CLICKPAD); - 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); + litest_add_for_device("udev:suspend", udev_double_suspend, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device("udev:suspend", udev_double_resume, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device("udev:suspend", udev_suspend_resume, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device("udev:device events", udev_device_sysname, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device("udev:seat", udev_seat_recycle, LITEST_SYNAPTICS_CLICKPAD_X220); }