kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t/lib-git-daemon: fix signal checking 

Test scripts checking 'git daemon' stop the daemon with a TERM signal,
and the 'stop_git_daemon' helper checks the daemon's exit status to
make sure that it indeed died because of that signal.

This check is bogus since 03c39b3458 (t/lib-git-daemon: use
test_match_signal, 2016-06-24), for two reasons:

  - Right after killing 'git daemon', 'stop_git_daemon' saves its exit
    status in a variable, but since 03c39b3458 the condition checking
    the exit status looks at '$?', which at this point is not the exit
    status of 'git daemon', but that of the variable assignment, i.e.
    it's always 0.

  - The unexpected exit status should abort the whole test script with
    'error', but it doesn't, because 03c39b3458 forgot to negate
    'test_match_signal's exit status in the condition.

This patch fixes both issues.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
SZEDER Gábor 2018-11-26 21:03:37 +01:00 committed by Junio C Hamano
parent 268fbcd172
commit 4c2eb06419
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/lib-git-daemon.sh
View File

@ -92,7 +92,7 @@ stop_git_daemon() {
kill "$GIT_DAEMON_PID" kill "$GIT_DAEMON_PID"
wait "$GIT_DAEMON_PID" >&3 2>&4 wait "$GIT_DAEMON_PID" >&3 2>&4
ret=$? ret=$?
if test_match_signal 15 $? if ! test_match_signal 15 $ret
then then
error "git daemon exited with status: $ret" error "git daemon exited with status: $ret"
fi fi