test: install the litest device groups file

We never installed the device groups file for the tests, effectively relying
on a system copy to be installed already.

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

diff --git a/meson.build b/meson.build
index 41723a658f688f2038da12dc8b6d4f4e893ff106..e1ea40cbb71f4df8b2a942f29231c8f8f020c196 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -493,9 +493,11 @@ if get_option('enable-tests')
        def_quirks_rules_file = '-DLIBINPUT_MODEL_QUIRKS_UDEV_RULES_FILE="@0@"'.format(litest_model_quirks_file)
        def_quirks_hwdb_file = '-DLIBINPUT_MODEL_QUIRKS_UDEV_HWDB_FILE="@0@/udev/90-libinput-model-quirks.hwdb"'.format(meson.source_root())
        def_test_rules_file = '-DLIBINPUT_TEST_DEVICE_RULES_FILE="@0@/udev/80-libinput-test-device.rules"'.format(meson.source_root())
+       def_device_groups_file = '-DLIBINPUT_DEVICE_GROUPS_RULES_FILE="@0@"'.format(litest_groups_rules_file)
        defs_litest = [def_quirks_rules_file,
                       def_quirks_hwdb_file,
-                      def_test_rules_file]
+                      def_test_rules_file,
+                      def_device_groups_file]
 
        lib_litest = static_library('litest',
                                    lib_litest_sources,

diff --git a/test/Makefile.am b/test/Makefile.am
index 1ff1406470f60d3eb602bb27680143a500d66af2..5cb89a6526212345f82662d78ee70211b2f441bd 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -82,7 +82,8 @@ liblitest_la_LIBADD = $(top_builddir)/src/libinput-util.la
 liblitest_la_CFLAGS = $(AM_CFLAGS) \
              -DLIBINPUT_MODEL_QUIRKS_UDEV_RULES_FILE="\"$(abs_top_builddir)/udev/90-libinput-model-quirks-litest.rules\"" \
              -DLIBINPUT_MODEL_QUIRKS_UDEV_HWDB_FILE="\"$(abs_top_srcdir)/udev/90-libinput-model-quirks.hwdb\"" \
-             -DLIBINPUT_TEST_DEVICE_RULES_FILE="\"$(abs_top_srcdir)/udev/80-libinput-test-device.rules\""
+             -DLIBINPUT_TEST_DEVICE_RULES_FILE="\"$(abs_top_srcdir)/udev/80-libinput-test-device.rules\"" \
+             -DLIBINPUT_DEVICE_GROUPS_RULES_FILE="\"$(abs_top_srcdir)/udev/80-libinput-device-groups-litest.rules\""
 if HAVE_LIBUNWIND
 liblitest_la_LIBADD += $(LIBUNWIND_LIBS) -ldl
 liblitest_la_CFLAGS += $(LIBUNWIND_CFLAGS)

diff --git a/test/litest.c b/test/litest.c
index a7449a4074d3a9b2143b7b5f17e1a157c8b69c9f..51e569fb526b7dd84bf99484fc1fe29c978bdb3e 100644 (file)
--- a/test/litest.c
+++ b/test/litest.c
@@ -60,6 +60,8 @@
        "/91-litest-model-quirks-REMOVEME.hwdb"
 #define UDEV_TEST_DEVICE_RULE_FILE UDEV_RULES_D \
        "/91-litest-test-device-REMOVEME.rules"
+#define UDEV_DEVICE_GROUPS_FILE UDEV_RULES_D \
+       "/80-libinput-device-groups-litest.rules"
 
 static int jobs = 8;
 static int in_debugger = -1;
@@ -1174,6 +1176,11 @@ litest_install_model_quirks(struct list *created_files_list)
                                LIBINPUT_TEST_DEVICE_RULES_FILE,
                                warning);
        list_insert(created_files_list, &file->link);
+
+       file = litest_copy_file(UDEV_DEVICE_GROUPS_FILE,
+                               LIBINPUT_DEVICE_GROUPS_RULES_FILE,
+                               warning);
+       list_insert(created_files_list, &file->link);
 }
 
 static void