From c879b47b389eaeceabc6a1b61c9fc83d0af89cd5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 6 Mar 2019 13:43:00 +1000 Subject: [PATCH] test: split the test-specific #defines out These don't need to be in the libinput config.h Signed-off-by: Peter Hutterer --- meson.build | 10 +++++++--- test/litest.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index b4cb3331..57c4cebc 100644 --- a/meson.build +++ b/meson.build @@ -778,11 +778,12 @@ if get_option('tests') install : false, configuration : udev_rules_config) - config_h.set_quoted('LIBINPUT_TEST_DEVICE_RULES_FILE', + litest_config_h = configuration_data() + litest_config_h.set_quoted('LIBINPUT_TEST_DEVICE_RULES_FILE', join_paths(meson.build_root(), '80-libinput-test-device.rules')) - config_h.set_quoted('LIBINPUT_DEVICE_GROUPS_RULES_FILE', + litest_config_h.set_quoted('LIBINPUT_DEVICE_GROUPS_RULES_FILE', join_paths(meson.build_root(), '80-libinput-device-groups.rules')) - config_h.set_quoted('LIBINPUT_MODEL_QUIRKS_UDEV_RULES_FILE', + litest_config_h.set_quoted('LIBINPUT_MODEL_QUIRKS_UDEV_RULES_FILE', join_paths(meson.build_root(), '90-libinput-model-quirks.rules')) def_no_main = '-DLITEST_NO_MAIN' @@ -853,6 +854,9 @@ if get_option('tests') '--suppressions=' + valgrind_suppressions_file ], env : valgrind_env, timeout_multiplier : 100) + configure_file(output : 'litest-config.h', + install : false, + configuration : litest_config_h) endif ############ output files ############ configure_file(output : 'config.h', install : false, configuration : config_h) diff --git a/test/litest.h b/test/litest.h index 50171a82..8002b63e 100644 --- a/test/litest.h +++ b/test/litest.h @@ -22,6 +22,7 @@ */ #include "config.h" +#include "litest-config.h" #ifndef LITEST_H #define LITEST_H -- 2.34.1