mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-08 12:26:13 +02:00
Code

Merge branch 'sg/fast-import-dump-refs-on-checkpoint-fix' 

Test update.

* sg/fast-import-dump-refs-on-checkpoint-fix:
  t9300: wait for background fast-import process to die after killing it
This commit is contained in:
Junio C Hamano 2018-08-15 15:08:20 -07:00
parent ae4e3f4ae2 ab29f1b329
commit 1638a625ca
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/t9300-fast-import.sh
View File

@ -3147,7 +3147,10 @@ background_import_then_checkpoint () {
echo $! >V.pid
# We don't mind if fast-import has already died by the time the test
# ends.
test_when_finished "exec 8>&-; exec 9>&-; kill $(cat V.pid) || true"
test_when_finished "
exec 8>&-; exec 9>&-;
kill $(cat V.pid) && wait $(cat V.pid)
true"
# Start in the background to ensure we adhere strictly to (blocking)
# pipes writing sequence. We want to assume that the write below could