From: Johannes Schindelin <Johannes.Schindelin@gmx•de>
To: Jeff King <peff@peff•net>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 2/2] ci(windows-meson-test): handle options and output like other test jobs
Date: Tue, 25 Nov 2025 18:39:57 +0100 (CET) [thread overview]
Message-ID: <a15a12e5-9099-f43b-fa11-e18d53759c1b@gmx.de> (raw)
In-Reply-To: <20251118093519.GB530438@coredump.intra.peff.net>
Hi Jeff,
On Tue, 18 Nov 2025, Jeff King wrote:
> The GitHub windows-meson-test jobs directly run "meson test" with the
> --slice option. This means they skip all of the ci/lib.sh
> infrastructure, and in particular:
>
> 1. They do not actually set any GIT_TEST_OPTS like --verbose-log or
> -x.
>
> 2. They do not do the usual handle_failed_tests() magic to print test
> failures or tar up failed directories.
>
> As a result, you get almost no feedback at all when a test fails in this
> job, making debugging rather tricky.
>
> Let's try to make this behave more like the other CI jobs. Because we're
> on Windows, we can't just use the normal run-build-and-tests.sh script.
> Our build runs as a separate job (like the non-meson Windows job), and
> then we parallelize the tests across several job slices. So we need
> something like the run-test-slice.sh script that the "windows-test" job
> uses.
>
> In theory we could just swap out the "make" invocation there for
> "meson". But it doesn't quite work, because "make" knows how to pull
> GIT_TEST_OPTS out of GIT-BUILD-OPTIONS automatically. But for meson, we
> have to extract them into the --test-args option ourselves. I tried
> making the logic in run-test-slice.sh conditional, but there ended up
> being hardly any common code at all (and there are some tricky ordering
> constraints). So I added up with a new meson-specific test-slice runner.
>
> Signed-off-by: Jeff King <peff@peff•net>
> ---
Thank you for fixing this. The patch looks good to me.
I cannot help but wonder whether switching to Meson was worth it, as we're
not only deviating from the mainstream (if MSYS2 is any indication, Meson
usage is negligible: 16 packages use it in MSYS2, 294 use CMake, and 975
use GNU make), but also are forced to repeat the very same steps we
already took for `make`-based builds and then for CMake builds. This very
much makes me think of some saying I vaguely remember that involves
history and something about repetitions.
> BTW, one curiosity. I tried swapping out "pwsh" as the shell for "bash",
> to match what the non-meson test does. And it _mostly_ works, but
> curiously it causes a handful of mergetool tests to fail (it looks like
> maybe "c:\foo" Windows-style paths get used where we expect "/c/foo"
> paths). I didn't dig further, and just added it to my "things that
> confuse and terrify me about Windows" list.
Indeed, the path conversion kicks in, where `/mingw64` gets converted to
`D:\git-for-windows-minimal\mingw64` or something like that so that
PowerShell isn't losing its mind over paths that simply don't exist. When
you then call Bash (implicitly, as you know all too well Git's test suite
depends on it in a major way, which is still a shame), this conversion is
not reverted, at least not fully.
Ciao,
Johannes
>
> .github/workflows/main.yml | 12 +++++++++++-
> ci/run-test-slice-meson.sh | 13 +++++++++++++
> 2 files changed, 24 insertions(+), 1 deletion(-)
> create mode 100755 ci/run-test-slice-meson.sh
>
> diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
> index 816d5a34c4..27ebf2c8cc 100644
> --- a/.github/workflows/main.yml
> +++ b/.github/workflows/main.yml
> @@ -298,7 +298,17 @@ jobs:
> path: build
> - name: Test
> shell: pwsh
> - run: meson test -C build --no-rebuild --print-errorlogs --slice "$(1+${{ matrix.nr }})/10"
> + run: ci/run-test-slice-meson.sh build ${{matrix.nr}} 10
> + - name: print test failures
> + if: failure() && env.FAILED_TEST_ARTIFACTS != ''
> + shell: bash
> + run: ci/print-test-failures.sh
> + - name: Upload failed tests' directories
> + if: failure() && env.FAILED_TEST_ARTIFACTS != ''
> + uses: actions/upload-artifact@v4
> + with:
> + name: failed-tests-windows-meson-${{ matrix.nr }}
> + path: ${{env.FAILED_TEST_ARTIFACTS}}
>
> regular:
> name: ${{matrix.vector.jobname}} (${{matrix.vector.pool}})
> diff --git a/ci/run-test-slice-meson.sh b/ci/run-test-slice-meson.sh
> new file mode 100755
> index 0000000000..961c94fba0
> --- /dev/null
> +++ b/ci/run-test-slice-meson.sh
> @@ -0,0 +1,13 @@
> +#!/bin/sh
> +
> +# We must load the build options so we know where to find
> +# things like TEST_OUTPUT_DIRECTORY. This has to come before
> +# loading lib.sh, though, because it may clobber some CI lib
> +# variables like our custom GIT_TEST_OPTS.
> +. "$1"/GIT-BUILD-OPTIONS
> +. ${0%/*}/lib.sh
> +
> +group "Run tests" \
> + meson test -C "$1" --no-rebuild --print-errorlogs \
> + --test-args="$GIT_TEST_OPTS" --slice "$((1+$2))/$3" ||
> +handle_failed_tests
> --
> 2.52.0.278.gadc6434dc3
>
>
prev parent reply other threads:[~2025-11-25 17:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-18 9:32 [PATCH 0/2] meson-windows-test ci output fixes Jeff King
2025-11-18 9:32 ` [PATCH 1/2] unit-test: ignore --no-chain-lint Jeff King
2025-11-18 9:35 ` [PATCH 2/2] ci(windows-meson-test): handle options and output like other test jobs Jeff King
2025-11-25 17:39 ` Johannes Schindelin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a15a12e5-9099-f43b-fa11-e18d53759c1b@gmx.de \
--to=johannes.schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox