mirror of
https://github.com/git/git.git
synced 2026-03-01 18:24:00 +01:00
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>
This commit is contained in:
committed by
Junio C Hamano
parent
8b979ec751
commit
493f1fa3ff
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@@ -298,7 +298,7 @@ jobs:
|
||||
path: build
|
||||
- name: Test
|
||||
shell: pwsh
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user