meson.build: add the tests that need uinput into a needs-uinput suite

This way we can skip it all by meson test --no-suite=needs-uinput

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 892e0c7df189b890582bc8fb84591fad3bed2da0..c113ae787e52a7b1040378f3581d29435e54dc3c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -842,4 +842,7 @@ autotools-from-tarball:
     - popd > /dev/null
     - popd > /dev/null
     - ls -lR $INSTALLDIR
+  variables:
+    LIBEVDEV_SKIP_ROOT_TESTS: 1
+
   needs: ['fedora:35@container-prep']

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 9385957bebf3d708ddff6631caf6db896207f045..fc1be6e1620d2b968c41ea56b8b8331b0559a877 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -532,5 +532,8 @@ autotools-from-tarball:
     - popd > /dev/null
     - popd > /dev/null
     - ls -lR $INSTALLDIR
+  variables:
+    LIBEVDEV_SKIP_ROOT_TESTS: 1
+
   needs: ['{{distro.name}}:{{version}}@container-prep']
 {% endfor %}

diff --git a/meson.build b/meson.build
index 8a5244009866c53a57b1075b45773fbf4d3227c4..62d903356205fa37a0d16c696b7639a34929686e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -164,7 +164,7 @@ if dep_check.found()
                                      include_directories: [includes_include],
                                      dependencies: [dep_libevdev, dep_check],
                                      install: false)
-       test('test-event-codes', test_event_codes, suite: 'library')
+       test('test-event-codes', test_event_codes, suite: ['library', 'needs-uinput'])
 
        test_internals = executable('test-internals',
                                    sources: src_common + [
@@ -173,7 +173,7 @@ if dep_check.found()
                                    include_directories: [includes_include],
                                    dependencies: [dep_libevdev, dep_check],
                                    install: false)
-       test('test-internals', test_internals, suite: 'library')
+       test('test-internals', test_internals, suite: ['library', 'needs-uinput'])
 
        test_uinput = executable('test-uinput',
                                 sources: src_common + [
@@ -182,7 +182,7 @@ if dep_check.found()
                                 include_directories: [includes_include],
                                 dependencies: [dep_libevdev, dep_check],
                                 install: false)
-       test('test-uinput', test_uinput, suite: 'library')
+       test('test-uinput', test_uinput, suite: ['library', 'needs-uinput'])
 
        test_libevdev = executable('test-libevdev',
                                   sources: src_common + [
@@ -193,7 +193,7 @@ if dep_check.found()
                                   include_directories: [includes_include],
                                   dependencies: [dep_libevdev, dep_check],
                                   install: false)
-       test('test-libevdev', test_libevdev, suite: 'library', env: ['CK_DEFAULT_TIMEOUT=10'])
+       test('test-libevdev', test_libevdev, suite: ['library', 'needs-uinput'], env: ['CK_DEFAULT_TIMEOUT=10'])
 
        test_kernel = executable('test-kernel',
                                 sources: src_common + [
@@ -202,7 +202,7 @@ if dep_check.found()
                                 include_directories: [includes_include],
                                 dependencies: [dep_libevdev, dep_check],
                                 install: false)
-       test('test-kernel', test_kernel, suite: 'kernel')
+       test('test-kernel', test_kernel, suite: ['kernel', 'needs-uinput'])
 
 
        valgrind = find_program('valgrind', required: false)