diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-16 00:08:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-16 00:08:20 +0200 |
| commit | 1638a625ca836605991f663cfcae4ca1ad542480 (patch) | |
| tree | 04c4109dfa06f4f6d99a2ba9f54e7b842431c796 /t/t9300-fast-import.sh | |
| parent | Merge branch 'sb/trailers-docfix' (diff) | |
| parent | t9300: wait for background fast-import process to die after killing it (diff) | |
| download | git-1638a625ca836605991f663cfcae4ca1ad542480.tar.xz git-1638a625ca836605991f663cfcae4ca1ad542480.zip | |
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
Diffstat (limited to 't/t9300-fast-import.sh')
| -rwxr-xr-x | t/t9300-fast-import.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 9e7f96223d..fac33e524c 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -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 |