From: Patrick Steinhardt Date: Thu, 04 Jun 2026 10:07:30 GMT Subject: [PATCH v3 0/8] t: fix broken TAP output Message-ID: <20260604-pks-t7527-fix-tap-output-v3-0-7d766ed481e4@pks.im> In-Reply-To: <20260602-pks-t7527-fix-tap-output-v1-0-db3da2a1b137@pks.im> Hi, this small patch series fixes another instance of broken TAP output that has landed via 4d11b9c218 (Merge branch 'pt/fsmonitor-linux', 2026-05-31). As this has happened multiple times by now I decided to have a look at whether we can fix this class of issues a bit more holistically. So this series also contains a change that makes prove bail out when it sees invalid TAP output, which uncovers a small set of preexisting issues in our test suite. Changes in v3: - Fix a test gap for AlmaLinux and Debian in GitLab CI, which uncovers an issue flagged by Peff. - Fix TAP breakage in t7810. - Link to v2: https://patch.msgid.link/20260603-pks-t7527-fix-tap-output-v2-0-cf3af5694e20@pks.im Changes in v2: - Fix waiting for p4d, and deduplicate the logic that does this. - Link to v1: https://patch.msgid.link/20260602-pks-t7527-fix-tap-output-v1-0-db3da2a1b137@pks.im Test runs can be found at [1] and [2]. Note that GitHub-side tests are failing on Windows, but that is a preexisting failure on "master". Thanks! Patrick [1]: https://gitlab.com/gitlab-org/git/-/merge_requests/585 [2]: https://github.com/git/git/pull/2320 --- Patrick Steinhardt (8): gitlab-ci: rearrange Linux jobs to match GitHub's order gitlab-ci: add missing Linux jobs ci: unify Linux images across GitLab and GitHub t7527: fix broken TAP output t7810: turn MB_REGEX check into a lazy prereq t/test-lib: silence EBUSY errors on Windows during test cleanup t/lib-git-p4: silence output when killing p4d and its watchdog t: let prove fail when parsing invalid TAP output .github/workflows/main.yml | 2 +- .gitlab-ci.yml | 23 +++++++++++++++-------- ci/lib.sh | 2 +- t/lib-git-p4.sh | 4 ++-- t/t7527-builtin-fsmonitor.sh | 7 ++++--- t/t7810-grep.sh | 5 +++-- t/test-lib.sh | 10 ++++++++-- 7 files changed, 34 insertions(+), 19 deletions(-) Range-diff versus v2: -: ---------- > 1: 5e817b102f gitlab-ci: rearrange Linux jobs to match GitHub's order -: ---------- > 2: 83646cc834 gitlab-ci: add missing Linux jobs -: ---------- > 3: cca1567fbf ci: unify Linux images across GitLab and GitHub 1: 52abbd5280 = 4: 430bc51818 t7527: fix broken TAP output -: ---------- > 5: 78ef22df8d t7810: turn MB_REGEX check into a lazy prereq 2: ea1f1eb466 = 6: 7bbaeff48c t/test-lib: silence EBUSY errors on Windows during test cleanup 3: e97a515470 = 7: abf2be09e6 t/lib-git-p4: silence output when killing p4d and its watchdog 4: 436d7d8cf3 = 8: 04367c34be t: let prove fail when parsing invalid TAP output --- base-commit: 1666c1265231b0bc5f613fbbf3f0a9896cdef76e change-id: 20260601-pks-t7527-fix-tap-output-105da1d73df0