git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-05 17:40:24 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge pull request #2180 from dscho/t6500-and-msys2-runtime-v3.x

Browse Source 
Prepare the gc tests for v3.x of the MSYS2 runtime
This commit is contained in:
Johannes Schindelin
2019-05-06 21:44:39 +02:00
committed by Johannes Schindelin
parent 3badbc69dc 6574fc40a2
commit 8100cee16c
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
t/t6500-gc.sh
View File

@@ -162,7 +162,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 &&