Git fork

Merge branch 'js/t5410-tee-hang-workaround'

* js/t5410-tee-hang-workaround:
t5410: avoid hangs in CI runs in the win+Meson test jobs

+15 -2
+15 -2
t/t5410-receive-pack.sh
··· 41 41 test_cmp expect actual.haves 42 42 ' 43 43 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' ' 45 57 test_when_finished rm -rf repo remote.git setup.git && 46 58 47 59 git init repo && ··· 62 74 test_must_fail git -C remote.git cat-file -e $(git -C repo rev-parse HEAD) 63 75 ' 64 76 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' ' 66 79 test_when_finished rm -rf repo remote.git setup.git && 67 80 68 81 git init repo &&