mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-01 05:54:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

t6026-merge-attr: clean up background process at end of test case

Browse Source 
The process spawned in the hook uses the test's trash directory as CWD.
As long as it is alive, the directory cannot be removed on Windows.
Although the test succeeds, the 'test_done' that follows produces an
error message and leaves the trash directory around. Kill the process
before the test case advances.

Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt 2016-09-07 08:10:41 +02:00 committed by Junio C Hamano
parent 6ebdac1bab
commit 5babb5bdb3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t6026-merge-attr.sh
View File

@ -185,7 +185,9 @@ test_expect_success 'custom merge does not lock index' '
git reset --hard anchor && git reset --hard anchor &&
write_script sleep-one-second.sh <<-\EOF && write_script sleep-one-second.sh <<-\EOF &&
sleep 1 & sleep 1 &
echo $! >sleep.pid
EOF EOF
test_when_finished "kill \$(cat sleep.pid)" &&
test_write_lines >.gitattributes \ test_write_lines >.gitattributes \
"* merge=ours" "text merge=sleep-one-second" && "* merge=ours" "text merge=sleep-one-second" &&