fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-20 08:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CI: drop the job count for the valgrind test suite to 2

Browse source 
Too many timing-related failures with 4 or (the default) 8 jobs, clearly
our runners aren't fast enough.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2022-09-01 10:57:45 +10:00 • committed by Benjamin Tissoires
parent 24956221b9
commit 70c57e9644
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -490,6 +490,7 @@ freebsd:13.0@container-clean:
- if ! [[ -z $SUITE_NAMES ]]; then SUITES=$(echo $SUITE_NAMES | sed 's/\([^ ]*\)/libinput-test-suite-\1/g'); fi - if ! [[ -z $SUITE_NAMES ]]; then SUITES=$(echo $SUITE_NAMES | sed 's/\([^ ]*\)/libinput-test-suite-\1/g'); fi
- echo "Testing $SUITES" - echo "Testing $SUITES"
- export MESON_TEST_ARGS="$MESON_TEST_ARGS $SUITES" - export MESON_TEST_ARGS="$MESON_TEST_ARGS $SUITES"
- export LITEST_JOBS="2"
.fedora:36@test-suite-vm: .fedora:36@test-suite-vm:
@ -627,6 +628,7 @@ vm-valgrind-touchpad:
- vm-touchpad - vm-touchpad
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4
vm-valgrind-tap: vm-valgrind-tap:
stage: valgrind stage: valgrind
@ -634,6 +636,7 @@ vm-valgrind-tap:
- vm-tap - vm-tap
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4
vm-valgrind-touchpad-buttons: vm-valgrind-touchpad-buttons:
stage: valgrind stage: valgrind
@ -641,6 +644,7 @@ vm-valgrind-touchpad-buttons:
- vm-touchpad-buttons - vm-touchpad-buttons
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4
vm-valgrind-tablet: vm-valgrind-tablet:
stage: valgrind stage: valgrind
@ -648,6 +652,7 @@ vm-valgrind-tablet:
- vm-tablet - vm-tablet
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4
vm-valgrind-gestures-device: vm-valgrind-gestures-device:
stage: valgrind stage: valgrind
@ -655,6 +660,7 @@ vm-valgrind-gestures-device:
- vm-gestures-device - vm-gestures-device
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4
vm-valgrind-backends: vm-valgrind-backends:
stage: valgrind stage: valgrind
@ -662,6 +668,7 @@ vm-valgrind-backends:
- vm-backends - vm-backends
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4
vm-valgrind-misc: vm-valgrind-misc:
stage: valgrind stage: valgrind
@ -669,6 +676,7 @@ vm-valgrind-misc:
- vm-misc - vm-misc
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4
vm-valgrind-other devices: vm-valgrind-other devices:
stage: valgrind stage: valgrind
@ -676,6 +684,7 @@ vm-valgrind-other devices:
- vm-other devices - vm-other devices
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4
vm-valgrind-pointer: vm-valgrind-pointer:
stage: valgrind stage: valgrind
@ -683,6 +692,7 @@ vm-valgrind-pointer:
- vm-pointer - vm-pointer
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4
.fedora-build@template: .fedora-build@template:

2
.gitlab-ci/ci.template
View file

@ -366,6 +366,7 @@ check-commit:
- if ! [[ -z $SUITE_NAMES ]]; then SUITES=$(echo $SUITE_NAMES | sed 's/\([^ ]*\)/libinput-test-suite-\1/g'); fi - if ! [[ -z $SUITE_NAMES ]]; then SUITES=$(echo $SUITE_NAMES | sed 's/\([^ ]*\)/libinput-test-suite-\1/g'); fi
- echo "Testing $SUITES" - echo "Testing $SUITES"
- export MESON_TEST_ARGS="$MESON_TEST_ARGS $SUITES" - export MESON_TEST_ARGS="$MESON_TEST_ARGS $SUITES"
- export LITEST_JOBS="2"
{# qemu tests are only done for the latest version of any distribution #} {# qemu tests are only done for the latest version of any distribution #}
@ -405,6 +406,7 @@ vm-valgrind-{{suite.name}}:
- vm-{{suite.name}} - vm-{{suite.name}}
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4
{% endfor %} {% endfor %}
{% endfor %}{# for if distro.use_for_qemu_tests #} {% endfor %}{# for if distro.use_for_qemu_tests #}