mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t9300-fast-import: store the PID in a variable instead of pidfile

Browse Source 
The five tests running 'git fast-import' in the background in
't9300-fast-import.sh' store the PID of that background process in a
pidfile, to be used to check whether that background process survived
each test and then to kill it in test_when_finished commands.  To
achieve this all these five tests run three $(cat <pidfile>) command
substitutions each.

Store the PID of the background 'git fast-import' in a variable to
avoid those extra processes.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
SZEDER Gábor
2019-12-06 20:03:30 +01:00
committed by Junio C Hamano
parent da72936f54
commit 21f57620b2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3165,12 +3165,12 @@ background_import_then_checkpoint () {
rm V.output rm V.output
git fast-import $options <&8 >&9 & git fast-import $options <&8 >&9 &
echo $! >V.pid fi_pid=$!
# We don't mind if fast-import has already died by the time the test # We don't mind if fast-import has already died by the time the test
# ends. # ends.
test_when_finished " test_when_finished "
exec 8>&-; exec 9>&-; exec 8>&-; exec 9>&-;
kill $(cat V.pid) && wait $(cat V.pid) kill $fi_pid && wait $fi_pid
true" true"
# Start in the background to ensure we adhere strictly to (blocking) # Start in the background to ensure we adhere strictly to (blocking)
@ -3202,7 +3202,7 @@ background_import_then_checkpoint () {
} }
background_import_still_running () { background_import_still_running () {
if ! kill -0 "$(cat V.pid)" if ! kill -0 "$fi_pid"
then then
echo >&2 "background fast-import terminated too early" echo >&2 "background fast-import terminated too early"
false false