[PATCH libinput 5/6] test: move the Intuos 5 and Cintiq 13HD test tablets into the same device group

[Peter Hutterer]

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 test/litest-device-wacom-cintiq-13hdt-finger.c | 10 ++++++++++
 test/litest-device-wacom-cintiq-13hdt-pad.c    |  3 ++-
 test/litest-device-wacom-cintiq-13hdt-pen.c    | 10 ++++++++++
 test/litest-device-wacom-intuos-finger.c       | 10 ++++++++++
 test/litest-device-wacom-intuos-tablet.c       | 10 ++++++++++
 test/litest-device-wacom-intuos5-pad.c         |  1 +
 6 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/test/litest-device-wacom-cintiq-13hdt-finger.c b/test/litest-device-wacom-cintiq-13hdt-finger.c
index 7ed19d2..9c82de0 100644
--- a/test/litest-device-wacom-cintiq-13hdt-finger.c
+++ b/test/litest-device-wacom-cintiq-13hdt-finger.c
@@ -88,6 +88,15 @@ static int events[] = {
 	-1, -1,
 };
 
+static const char udev_rule[] =
+"ACTION==\"remove\", GOTO=\"rule_end\"\n"
+"KERNEL!=\"event*\", GOTO=\"rule_end\"\n"
+"\n"
+"ATTRS{name}==\"litest Wacom Cintiq 13 HD touch Finger*\",\\\n"
+"    ENV{LIBINPUT_DEVICE_GROUP}=\"wacom-13hdt-group\"\n"
+"\n"
+"LABEL=\"rule_end\"";
+
 struct litest_test_device litest_wacom_cintiq_13hdt_finger_device = {
 	.type = LITEST_WACOM_CINTIQ_13HDT_FINGER,
 	.features = LITEST_TOUCH,
@@ -99,4 +108,5 @@ struct litest_test_device litest_wacom_cintiq_13hdt_finger_device = {
 	.id = &input_id,
 	.events = events,
 	.absinfo = absinfo,
+	.udev_rule = udev_rule,
 };
diff --git a/test/litest-device-wacom-cintiq-13hdt-pad.c b/test/litest-device-wacom-cintiq-13hdt-pad.c
index d10f538..cc4add4 100644
--- a/test/litest-device-wacom-cintiq-13hdt-pad.c
+++ b/test/litest-device-wacom-cintiq-13hdt-pad.c
@@ -102,7 +102,8 @@ static const char udev_rule[] =
 "KERNEL!=\"event*\", GOTO=\"pad_end\"\n"
 "\n"
 "ATTRS{name}==\"litest Wacom Cintiq 13 HD touch Pad*\",\\\n"
-"    ENV{ID_INPUT_TABLET_PAD}=\"1\"\n"
+"    ENV{ID_INPUT_TABLET_PAD}=\"1\",\\\n"
+"    ENV{LIBINPUT_DEVICE_GROUP}=\"wacom-13hdt-group\"\n"
 "\n"
 "LABEL=\"pad_end\"";
 
diff --git a/test/litest-device-wacom-cintiq-13hdt-pen.c b/test/litest-device-wacom-cintiq-13hdt-pen.c
index 77e7c50..084d59a 100644
--- a/test/litest-device-wacom-cintiq-13hdt-pen.c
+++ b/test/litest-device-wacom-cintiq-13hdt-pen.c
@@ -133,6 +133,15 @@ static int events[] = {
 	-1, -1,
 };
 
+static const char udev_rule[] =
+"ACTION==\"remove\", GOTO=\"rule_end\"\n"
+"KERNEL!=\"event*\", GOTO=\"rule_end\"\n"
+"\n"
+"ATTRS{name}==\"litest Wacom Cintiq 13 HD touch Pen*\",\\\n"
+"    ENV{LIBINPUT_DEVICE_GROUP}=\"wacom-13hdt-group\"\n"
+"\n"
+"LABEL=\"rule_end\"";
+
 struct litest_test_device litest_wacom_cintiq_13hdt_pen_device = {
 	.type = LITEST_WACOM_CINTIQ_13HDT_PEN,
 	.features = LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_SERIAL | LITEST_TILT,
@@ -144,4 +153,5 @@ struct litest_test_device litest_wacom_cintiq_13hdt_pen_device = {
 	.id = &input_id,
 	.events = events,
 	.absinfo = absinfo,
+	.udev_rule = udev_rule,
 };
diff --git a/test/litest-device-wacom-intuos-finger.c b/test/litest-device-wacom-intuos-finger.c
index acd6928..8014588 100644
--- a/test/litest-device-wacom-intuos-finger.c
+++ b/test/litest-device-wacom-intuos-finger.c
@@ -90,6 +90,15 @@ static int events[] = {
 	-1, -1,
 };
 
+static const char udev_rule[] =
+"ACTION==\"remove\", GOTO=\"rule_end\"\n"
+"KERNEL!=\"event*\", GOTO=\"rule_end\"\n"
+"\n"
+"ATTRS{name}==\"litest Wacom Intuos5 touch M Finger*\",\\\n"
+"    ENV{LIBINPUT_DEVICE_GROUP}=\"wacom-i5-group\"\n"
+"\n"
+"LABEL=\"rule_end\"";
+
 struct litest_test_device litest_wacom_finger_device = {
 	.type = LITEST_WACOM_FINGER,
 	.features = LITEST_TOUCHPAD,
@@ -101,4 +110,5 @@ struct litest_test_device litest_wacom_finger_device = {
 	.id = &input_id,
 	.events = events,
 	.absinfo = absinfo,
+	.udev_rule = udev_rule,
 };
diff --git a/test/litest-device-wacom-intuos-tablet.c b/test/litest-device-wacom-intuos-tablet.c
index b31f6a5..00eac7a 100644
--- a/test/litest-device-wacom-intuos-tablet.c
+++ b/test/litest-device-wacom-intuos-tablet.c
@@ -149,6 +149,15 @@ static int events[] = {
 	-1, -1,
 };
 
+static const char udev_rule[] =
+"ACTION==\"remove\", GOTO=\"rule_end\"\n"
+"KERNEL!=\"event*\", GOTO=\"rule_end\"\n"
+"\n"
+"ATTRS{name}==\"litest Wacom Intuos5 touch M Pen*\",\\\n"
+"    ENV{LIBINPUT_DEVICE_GROUP}=\"wacom-i5-group\"\n"
+"\n"
+"LABEL=\"rule_end\"";
+
 struct litest_test_device litest_wacom_intuos_tablet_device = {
 	.type = LITEST_WACOM_INTUOS,
 	.features = LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_SERIAL | LITEST_TILT,
@@ -160,4 +169,5 @@ struct litest_test_device litest_wacom_intuos_tablet_device = {
 	.id = &input_id,
 	.events = events,
 	.absinfo = absinfo,
+	.udev_rule = udev_rule,
 };
diff --git a/test/litest-device-wacom-intuos5-pad.c b/test/litest-device-wacom-intuos5-pad.c
index 7cff412..cacc5c7 100644
--- a/test/litest-device-wacom-intuos5-pad.c
+++ b/test/litest-device-wacom-intuos5-pad.c
@@ -103,6 +103,7 @@ static const char udev_rule[] =
 "KERNEL!=\"event*\", GOTO=\"pad_end\"\n"
 "\n"
 "ATTRS{name}==\"litest Wacom Intuos5 touch M Pad*\",\\\n"
+"    ENV{LIBINPUT_DEVICE_GROUP}=\"wacom-i5-group\",\\\n"
 "    ENV{ID_INPUT_TABLET_PAD}=\"1\"\n"
 "\n"
 "LABEL=\"pad_end\"";
-- 
2.7.4