mirror of
https://gitlab.freedesktop.org/libevdev/libevdev.git
synced 2025-12-20 15:00:06 +01:00
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>
This commit is contained in:
parent
37f71a8493
commit
50ac79078e
2 changed files with 8 additions and 2 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue