diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-05 09:35:40 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-05 10:25:02 +1000 |
| commit | 427af9d2488a8289dd4ef81ec562c7636bdb18a5 (patch) | |
| tree | 567bf9a98f3c4be502aa76e81eedf9b34bb82396 | |
| parent | 6d0d778e59940953a16c209e7d2541e3247e8556 (diff) | |
| download | libevdev-427af9d2488a8289dd4ef81ec562c7636bdb18a5.tar.gz | |
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>
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | .gitlab-ci/ci.template | 3 | ||||
| -rw-r--r-- | meson.build | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 892e0c7..c113ae7 100644 --- 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 9385957..fc1be6e 100644 --- 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 dd37c66..e63a1af 100644 --- a/meson.build +++ b/meson.build @@ -162,7 +162,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 + [ @@ -171,7 +171,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 + [ @@ -180,7 +180,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 + [ @@ -191,7 +191,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 + [ @@ -200,7 +200,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) |