summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2019-07-01 12:34:09 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2019-07-08 13:25:32 +1000
commit63e7942008bdafe4c219033984ca4550fcd03463 (patch)
tree1c0819ed269fa4fde2a5200782bcfca1e6969047
parent734ada5e94f8bdf8a1f45ec092c741a35d94bf95 (diff)
downloadlibinput-63e7942008bdafe4c219033984ca4550fcd03463.tar.gz
meson.build: move the leftover udev rule check up
ninja executes the test in the same order but we don't want to waste 5 minutes testing other things when we have a udev rule leftover from a previous run. Plus, this test can't be run in parallel with others, so in the worst case we had to wait for several long-running tests to finish before this one could be started. To avoid all this, let's move this up to be the first check. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--meson.build19
1 files changed, 13 insertions, 6 deletions
diff --git a/meson.build b/meson.build
index a52b721b..363fcd41 100644
--- a/meson.build
+++ b/meson.build
@@ -180,6 +180,19 @@ litest_fuzz_override_file = configure_file(input : 'udev/90-libinput-fuzz-overri
install : false,
configuration : litest_udev_rules_config)
+############ Check for leftover udev rules ########
+
+# This test should be defined first so we don't waste time testing anything
+# else if we're about to fail anyway. ninja test will execute tests in the
+# order of them defined in meson.build
+
+if get_option('tests')
+ test('leftover-rules',
+ find_program('test/check-leftover-udev-rules.sh'),
+ is_parallel : false,
+ suite : ['all'])
+endif
+
############ libepoll-shim (BSD) ############
if cc.has_header_symbol('sys/epoll.h', 'epoll_create1', prefix : prefix)
@@ -685,12 +698,6 @@ endif
if get_option('tests')
dep_check = dependency('check', version : '>= 0.9.10')
- leftover_rules = find_program('test/check-leftover-udev-rules.sh')
- test('leftover-rules',
- leftover_rules,
- is_parallel : false,
- suite : ['all'])
-
gstack = find_program('gstack', required : false)
config_h.set10('HAVE_GSTACK', gstack.found())