diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:29 +0900 |
| commit | b20b8fecfb3bc3fc27bc3709aba4e57f5388a62b (patch) | |
| tree | 5e4e81412b4fa752e42b69ffa85da895698b93c5 | |
| parent | Merge branch 'jk/apache-lsan' (diff) | |
| parent | t6500(mingw): use the Windows PID of the shell (diff) | |
| download | tgif-b20b8fecfb3bc3fc27bc3709aba4e57f5388a62b.tar.xz | |
Merge branch 'js/t6500-use-windows-pid-on-mingw'
Future-proof a test against an update to MSYS2 runtime v3.x series.
* js/t6500-use-windows-pid-on-mingw:
t6500(mingw): use the Windows PID of the shell
| -rwxr-xr-x | t/t6500-gc.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index 7411bf7fec..515c6735e9 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -181,7 +181,15 @@ test_expect_success 'background auto gc respects lock for all operations' ' # now fake a concurrent gc that holds the lock; we can use our # shell pid so that it looks valid. hostname=$(hostname || echo unknown) && - printf "$$ %s" "$hostname" >.git/gc.pid && + shell_pid=$$ && + if test_have_prereq MINGW && test -f /proc/$shell_pid/winpid + then + # In Git for Windows, Bash (actually, the MSYS2 runtime) has a + # different idea of PIDs than git.exe (actually Windows). Use + # the Windows PID in this case. + shell_pid=$(cat /proc/$shell_pid/winpid) + fi && + printf "%d %s" "$shell_pid" "$hostname" >.git/gc.pid && # our gc should exit zero without doing anything run_and_wait_for_auto_gc && |