From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 5 Jan 2023 00:11:37 +0000 (+1000)
Subject: gitlab CI: skip the right tests in the tarball jobs
X-Git-Tag: accepted/tizen/unified/20231121.102917~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2500615a18bb49521aaa84e25ecc40e80f85369f;p=platform%2Fupstream%2Flibevdev.git

gitlab CI: skip the right tests in the tarball jobs

Use the new needs-uinput suite specifier for the meson build job, and
use --no-tests for ninja dist in the autotools build job.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c113ae7..a4e810e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -810,13 +810,13 @@ meson-from-tarball:
     - pushd _build > /dev/null
     - ../autogen.sh --disable-silent-rules $CONFIGURE_FLAGS
     - make
-    - make distcheck
+    - make dist
     - popd > /dev/null
     - mkdir -p _tarball_dir
     - tar xf _build/libevdev-*.tar.xz -C _tarball_dir
     - pushd _tarball_dir/libevdev-*/ > /dev/null
     - meson "$MESON_BUILDDIR" --prefix="$INSTALLDIR"
-    - ninja -C "$MESON_BUILDDIR" test
+    - meson test -C "$MESON_BUILDDIR" --no-suite="needs-uinput"
     - ninja -C "$MESON_BUILDDIR" install
     - popd > /dev/null
     - ls -lR $INSTALLDIR
@@ -829,7 +829,7 @@ autotools-from-tarball:
   script:
     - export INSTALLDIR="$PWD/_inst"
     - meson "$MESON_BUILDDIR"
-    - ninja -C "$MESON_BUILDDIR" dist
+    - meson dist -C "$MESON_BUILDDIR" --no-tests
     - mkdir -p _tarball_dir
     - tar xf "$MESON_BUILDDIR"/meson-dist/libevdev-*.xz -C _tarball_dir
     - pushd _tarball_dir/libevdev-*/ > /dev/null
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index fc1be6e..c8fd9aa 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -500,13 +500,13 @@ meson-from-tarball:
     - pushd _build > /dev/null
     - ../autogen.sh --disable-silent-rules $CONFIGURE_FLAGS
     - make
-    - make distcheck
+    - make dist
     - popd > /dev/null
     - mkdir -p _tarball_dir
     - tar xf _build/libevdev-*.tar.xz -C _tarball_dir
     - pushd _tarball_dir/libevdev-*/ > /dev/null
     - meson "$MESON_BUILDDIR" --prefix="$INSTALLDIR"
-    - ninja -C "$MESON_BUILDDIR" test
+    - meson test -C "$MESON_BUILDDIR" --no-suite="needs-uinput"
     - ninja -C "$MESON_BUILDDIR" install
     - popd > /dev/null
     - ls -lR $INSTALLDIR
@@ -519,7 +519,7 @@ autotools-from-tarball:
   script:
     - export INSTALLDIR="$PWD/_inst"
     - meson "$MESON_BUILDDIR"
-    - ninja -C "$MESON_BUILDDIR" dist
+    - meson dist -C "$MESON_BUILDDIR" --no-tests
     - mkdir -p _tarball_dir
     - tar xf "$MESON_BUILDDIR"/meson-dist/libevdev-*.xz -C _tarball_dir
     - pushd _tarball_dir/libevdev-*/ > /dev/null