diff options
| author | Patrick Steinhardt <ps@pks.im> | 2026-02-19 07:25:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-19 10:22:31 -0800 |
| commit | 2cca4ef34306c04a8ae891e0ea4a876922069dce (patch) | |
| tree | 381618536de9378c06ebda5e8befe2dc6e667969 | |
| parent | 420b4ca2dce7143fcd79892393a879a1d8e276f7 (diff) | |
| download | git-2cca4ef34306c04a8ae891e0ea4a876922069dce.tar.xz | |
ci: make test slicing consistent across Meson/Make
In the preceding commit we have adjusted test slicing to be one-based
when using the "ci/run-test-slice.sh" script. But we also have an
equivalent script for Meson that is still zero-based, which is of course
inconsistent.
Adapt the script to be one-based, as well, and adapt the GitHub workflow
accordingly. Note that GitLab doesn't yet use the script, so it does not
need to be adapted. This will change in the next commit though.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | .github/workflows/main.yml | 2 | ||||
| -rwxr-xr-x | ci/run-test-slice-meson.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a011d8d0f9..826f2f5d3a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -298,7 +298,7 @@ jobs: path: build - name: Test shell: bash - run: ci/run-test-slice-meson.sh build ${{matrix.nr}} 10 + run: ci/run-test-slice-meson.sh build $((${{matrix.nr}} + 1)) 10 - name: print test failures if: failure() && env.FAILED_TEST_ARTIFACTS != '' shell: bash diff --git a/ci/run-test-slice-meson.sh b/ci/run-test-slice-meson.sh index 961c94fba0..a6df927ba5 100755 --- a/ci/run-test-slice-meson.sh +++ b/ci/run-test-slice-meson.sh @@ -9,5 +9,5 @@ group "Run tests" \ meson test -C "$1" --no-rebuild --print-errorlogs \ - --test-args="$GIT_TEST_OPTS" --slice "$((1+$2))/$3" || + --test-args="$GIT_TEST_OPTS" --slice "$(($2))/$3" || handle_failed_tests |