From 712eb10aad2945d0d4b1784edd6bdb5603745457 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 24 Feb 2020 14:29:10 +1000 Subject: gitlab CI: run the kvm test suite without libwacom Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 36 ++++++++++++++++++++++++++++++++++++ .gitlab-ci/gitlab-ci.tmpl | 6 ++++++ 2 files changed, 42 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b5a6f15..695fe2cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -560,36 +560,72 @@ fedora:30@vm-touchpad: variables: SUITE_NAMES: 'touchpad' +fedora:30@vm-touchpad-no-libwacom: + extends: + - fedora:30@vm-touchpad + variables: + MESON_ARGS: '-Dlibwacom=false' + fedora:30@vm-tap: extends: - .fedora:30@test-suite-vm variables: SUITE_NAMES: 'tap' +fedora:30@vm-tap-no-libwacom: + extends: + - fedora:30@vm-tap + variables: + MESON_ARGS: '-Dlibwacom=false' + fedora:30@vm-tablet: extends: - .fedora:30@test-suite-vm variables: SUITE_NAMES: 'tablet' +fedora:30@vm-tablet-no-libwacom: + extends: + - fedora:30@vm-tablet + variables: + MESON_ARGS: '-Dlibwacom=false' + fedora:30@vm-gestures-device: extends: - .fedora:30@test-suite-vm variables: SUITE_NAMES: 'gestures device' +fedora:30@vm-gestures-device-no-libwacom: + extends: + - fedora:30@vm-gestures-device + variables: + MESON_ARGS: '-Dlibwacom=false' + fedora:30@vm-others: extends: - .fedora:30@test-suite-vm variables: SUITE_NAMES: 'context config misc events totem udev lid log timer tablet-mode quirks trackball pad path keyboard switch touch trackpoint' +fedora:30@vm-others-no-libwacom: + extends: + - fedora:30@vm-others + variables: + MESON_ARGS: '-Dlibwacom=false' + fedora:30@vm-pointer: extends: - .fedora:30@test-suite-vm variables: SUITE_NAMES: 'pointer' +fedora:30@vm-pointer-no-libwacom: + extends: + - fedora:30@vm-pointer + variables: + MESON_ARGS: '-Dlibwacom=false' + fedora:30@valgrind-touchpad: stage: valgrind diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl index eca3b5e1..373f1bdc 100644 --- a/.gitlab-ci/gitlab-ci.tmpl +++ b/.gitlab-ci/gitlab-ci.tmpl @@ -450,6 +450,12 @@ fedora:30@vm-{{suite.name}}: variables: SUITE_NAMES: '{{suite.suites}}' +fedora:30@vm-{{suite.name}}-no-libwacom: + extends: + - fedora:30@vm-{{suite.name}} + variables: + MESON_ARGS: '-Dlibwacom=false' + {% endfor %} {% for suite in test_suites %} -- cgit v1.2.1