Skip to content

Commit 14de3eb

Browse files
committed
Merge branch 'js/t5410-tee-hang-workaround'
* js/t5410-tee-hang-workaround: t5410: avoid hangs in CI runs in the win+Meson test jobs
2 parents 0d42fbd + 52a86dd commit 14de3eb

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

t/t5410-receive-pack.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,19 @@ test_expect_success 'with core.alternateRefsPrefixes' '
4141
test_cmp expect actual.haves
4242
'
4343

44-
test_expect_success 'receive-pack missing objects fails connectivity check' '
44+
# The `tee.exe` shipped in Git for Windows v2.49.0 is known to hang frequently
45+
# when spawned from `git.exe` and piping its output to `git.exe`. This seems
46+
# related to MSYS2 runtime bug fixes regarding the signal handling; Let's just
47+
# skip the tests that need to exercise this when the faulty MSYS2 runtime is
48+
# detected; The test cases are exercised enough in other matrix jobs of the CI
49+
# runs.
50+
test_lazy_prereq TEE_DOES_NOT_HANG '
51+
test_have_prereq !MINGW &&
52+
case "$(uname -a)" in *3.5.7-463ebcdc.x86_64*) false;; esac
53+
'
54+
55+
test_expect_success TEE_DOES_NOT_HANG \
56+
'receive-pack missing objects fails connectivity check' '
4557
test_when_finished rm -rf repo remote.git setup.git &&
4658
4759
git init repo &&
@@ -62,7 +74,8 @@ test_expect_success 'receive-pack missing objects fails connectivity check' '
6274
test_must_fail git -C remote.git cat-file -e $(git -C repo rev-parse HEAD)
6375
'
6476

65-
test_expect_success 'receive-pack missing objects bypasses connectivity check' '
77+
test_expect_success TEE_DOES_NOT_HANG \
78+
'receive-pack missing objects bypasses connectivity check' '
6679
test_when_finished rm -rf repo remote.git setup.git &&
6780
6881
git init repo &&

0 commit comments

Comments
 (0)