From aa538dc5c8ecf91a4f56167b4b820690a48841f4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 27 Jun 2019 11:12:58 +1000 Subject: [PATCH] meson: force litest to use the right udev rules We generate litest-specific udev rules that contain the path to the binaries in the builddir. But litest wasn't using those, so IMPORT would run things in /usr/lib/udev instead. Thus any changes to those binaries generated false test results depending on how compatible the system-installed libinput was. This is why 410b157 passed the test suite for example. Signed-off-by: Peter Hutterer --- meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 315632a..255f7f7 100644 --- a/meson.build +++ b/meson.build @@ -803,9 +803,11 @@ if get_option('tests') litest_config_h = configuration_data() litest_config_h.set_quoted('LIBINPUT_DEVICE_GROUPS_RULES_FILE', - join_paths(meson.build_root(), '80-libinput-device-groups.rules')) + join_paths(meson.build_root(), + '80-libinput-device-groups-litest.rules')) litest_config_h.set_quoted('LIBINPUT_FUZZ_OVERRIDE_UDEV_RULES_FILE', - join_paths(meson.build_root(), '90-libinput-fuzz-override.rules')) + join_paths(meson.build_root(), + '90-libinput-fuzz-override-litest.rules')) def_no_main = '-DLITEST_NO_MAIN' def_disable_backtrace = '-DLITEST_DISABLE_BACKTRACE_LOGGING' -- 2.7.4