diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2017-05-11 11:39:55 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2017-05-11 11:48:39 +1000 |
| commit | c2c97a0b016276174c5bd5624c0f332efea223d4 (patch) | |
| tree | 0730fe9caa5ff0b585a275cdc4a81ac345eb88ab /test | |
| parent | c68d8531fbeef7f0f0b82ec8b094928a9e3feeea (diff) | |
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>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 3 | ||||
| -rw-r--r-- | test/litest.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 1ff1406..5cb89a6 100644 --- 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 a7449a4..51e569f 100644 --- 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 |