fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-20 06:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: split the test-specific #defines out

Browse source 
These don't need to be in the libinput config.h

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2019-03-06 13:43:00 +10:00
parent fefddeda4d
commit c879b47b38
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
meson.build
View file

@ -778,11 +778,12 @@ if get_option('tests')
install : false, install : false,
configuration : udev_rules_config) 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')) 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')) 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')) join_paths(meson.build_root(), '90-libinput-model-quirks.rules'))
def_no_main = '-DLITEST_NO_MAIN' def_no_main = '-DLITEST_NO_MAIN'
@ -853,6 +854,9 @@ if get_option('tests')
'--suppressions=' + valgrind_suppressions_file ], '--suppressions=' + valgrind_suppressions_file ],
env : valgrind_env, env : valgrind_env,
timeout_multiplier : 100) timeout_multiplier : 100)
configure_file(output : 'litest-config.h',
install : false,
configuration : litest_config_h)
endif endif
############ output files ############ ############ output files ############
configure_file(output : 'config.h', install : false, configuration : config_h) configure_file(output : 'config.h', install : false, configuration : config_h)

1
test/litest.h
View file

@ -22,6 +22,7 @@
*/ */
#include "config.h" #include "config.h"
#include "litest-config.h"
#ifndef LITEST_H #ifndef LITEST_H
#define LITEST_H #define LITEST_H