fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-07 06:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CI: set the LITEST_JOBS in the template, not the script

Browse source 
Fixes: 70c57e9644 ("CI: drop the job count for the valgrind test suite to 2")
Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1063>
This commit is contained in:
Peter Hutterer 2024-10-17 13:57:19 +10:00
parent fb4c5dd7c6
commit 1c80605d56
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.gitlab-ci.yml
View file

@ -524,11 +524,11 @@ freebsd:13.2@container-clean:
variables: variables:
# remove the global --no-suite=hardware # remove the global --no-suite=hardware
MESON_TEST_ARGS: '' MESON_TEST_ARGS: ''
LITEST_JOBS: 4
before_script: before_script:
- 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:40@test-suite-vm: .fedora:40@test-suite-vm:
@ -666,7 +666,7 @@ vm-valgrind-touchpad:
- vm-touchpad - vm-touchpad
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4 LITEST_JOBS: 2
retry: retry:
max: 2 max: 2
rules: rules:
@ -678,7 +678,7 @@ vm-valgrind-tap:
- vm-tap - vm-tap
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4 LITEST_JOBS: 2
retry: retry:
max: 2 max: 2
rules: rules:
@ -690,7 +690,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 LITEST_JOBS: 2
retry: retry:
max: 2 max: 2
rules: rules:
@ -702,7 +702,7 @@ vm-valgrind-tablet:
- vm-tablet - vm-tablet
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4 LITEST_JOBS: 2
retry: retry:
max: 2 max: 2
rules: rules:
@ -714,7 +714,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 LITEST_JOBS: 2
retry: retry:
max: 2 max: 2
rules: rules:
@ -726,7 +726,7 @@ vm-valgrind-backends:
- vm-backends - vm-backends
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4 LITEST_JOBS: 2
retry: retry:
max: 2 max: 2
rules: rules:
@ -738,7 +738,7 @@ vm-valgrind-misc:
- vm-misc - vm-misc
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4 LITEST_JOBS: 2
retry: retry:
max: 2 max: 2
rules: rules:
@ -750,7 +750,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 LITEST_JOBS: 2
retry: retry:
max: 2 max: 2
rules: rules:
@ -762,7 +762,7 @@ vm-valgrind-pointer:
- vm-pointer - vm-pointer
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
LITEST_JOBS: 4 LITEST_JOBS: 2
retry: retry:
max: 2 max: 2
rules: rules:

4
.gitlab-ci/ci.template
View file

@ -400,11 +400,11 @@ pre-commit-hooks:
variables: variables:
# remove the global --no-suite=hardware # remove the global --no-suite=hardware
MESON_TEST_ARGS: '' MESON_TEST_ARGS: ''
LITEST_JOBS: 4
before_script: before_script:
- 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 #}
@ -444,7 +444,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 LITEST_JOBS: 2
retry: retry:
max: 2 max: 2
rules: rules: