From 01d2e38bf4e0827907ec0fd31abaa422b7ef8293 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 3 Jul 2018 16:03:51 +1000
Subject: [PATCH] GitLab CI: always run ninja test unless otherwise specified

Now that the test suite has been cleaned up to be useful even when we can't
run the main runner, let's always run ninja test. Except in the targets where
we want something different.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 .gitlab-ci.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e65ce9db..38e6986a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,11 +45,13 @@ variables:
   ARCH_PKGS:   'git gcc         pkgconfig          meson check       libsystemd    libevdev       doxygen graphviz valgrind binutils libwacom                     gtk3                        mtdev      '
   ############################ end of package lists #############################
   MESON_BUILDDIR: builddir
-  NINJA_ARGS: ''
+  NINJA_ARGS: 'test'
   MESON_PARAMS: ''
   FEDORA_DOCKER_IMAGE: $CI_REGISTRY/libinput/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION
   UBUNTU_DOCKER_IMAGE: $CI_REGISTRY/libinput/$CI_PROJECT_NAME/ubuntu/$UBUNTU_VERSION
   ARCH_DOCKER_IMAGE: $CI_REGISTRY/libinput/$CI_PROJECT_NAME/arch/rolling
+  # Until we have a VM with full access, we cannot run the test suite runner
+  SKIP_LIBINPUT_TEST_SUITE_RUNNER: 1
   # When using docker-in-docker (dind), it's wise to use the overlayfs driver
   # for improved performance.
   DOCKER_DRIVER: overlay2
@@ -571,14 +573,6 @@ fedora:28@build-no-tests-nodeps:
   before_script:
     - dnf remove -y check-devel
 
-fedora:28@build-run-tests:
-  <<: *fedora_28_template
-  <<: *default_build
-  variables:
-    FEDORA_VERSION: 28
-    SKIP_LIBINPUT_TEST_SUITE_RUNNER: 1
-    NINJA_ARGS: "test"
-
 fedora:28@scan-build:
   <<: *fedora_28_template
   <<: *default_build