From: Peter Hutterer Date: Wed, 4 Jan 2023 23:35:40 +0000 (+1000) Subject: meson.build: add the tests that need uinput into a needs-uinput suite X-Git-Tag: accepted/tizen/unified/20231121.102917~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eaf4a88be755c7ca1cac01ef85c5ed6dfec7870f;p=platform%2Fupstream%2Flibevdev.git 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 --- 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 8a52440..62d9033 100644 --- 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)