gitlab CI: pass the --no-suite to meson builds

Only use the LIBEVDEV_SKIP_ROOT_TESTS env var in autotools where we need
it, in meson we can use meson to control which tests we (don't) want to
run.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14851ce8034d83e1642d89312157a02ae7b5eef0..a71e47439889a909a52dae95815b9bfc6acdfc43 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,6 @@ stages:
 variables:
   # The upstrem repository we will check for images
   FDO_UPSTREAM_REPO: libevdev/libevdev
-  LIBEVDEV_SKIP_ROOT_TESTS: 1
   GIT_DEPTH: 1
   MESON_BUILDDIR: 'build dir'
 
@@ -59,12 +58,16 @@ variables:
     - make check
     - if ! [[ -z "$MAKE_ARGS" ]]; then make $MAKE_ARGS; fi
     - popd > /dev/null
+  variables:
+    LIBEVDEV_SKIP_ROOT_TESTS: 1
 
 .meson_build:
   extends:
     - .default_artifacts
   script:
     - .gitlab-ci/meson-build.sh --run-test
+  variables:
+    MESON_TEST_ARGS: '--no-suite=needs-uinput'
 
 .fedora:34:
   extends: .fdo.distribution-image@fedora

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index ed08d5d24f71c66868f2d58cf027f984a88a0f74..0eb1cea003ef2585d90384208a54c84be8dffa39 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -30,7 +30,6 @@ stages:
 variables:
   # The upstrem repository we will check for images
   FDO_UPSTREAM_REPO: libevdev/libevdev
-  LIBEVDEV_SKIP_ROOT_TESTS: 1
   GIT_DEPTH: 1
   MESON_BUILDDIR: 'build dir'
 
@@ -55,12 +54,16 @@ variables:
     - make check
     - if ! [[ -z "$MAKE_ARGS" ]]; then make $MAKE_ARGS; fi
     - popd > /dev/null
+  variables:
+    LIBEVDEV_SKIP_ROOT_TESTS: 1
 
 .meson_build:
   extends:
     - .default_artifacts
   script:
     - .gitlab-ci/meson-build.sh --run-test
+  variables:
+    MESON_TEST_ARGS: '--no-suite=needs-uinput'
 
 {# Generate templates for every distribution/version combination we want, any
   job can then just extends: .name:version and the images will sort