Skip to content

Commit

Permalink
t/lib-git-daemon: use test_match_signal
Browse files Browse the repository at this point in the history
When git-daemon exits, we expect it to be with the SIGTERM
we just sent it. If we see anything else, we'll complain.
But our check against exit code "143" is not portable. For
example:

  $ ksh93 t5570-git-daemon.sh
  [...]
  error: git daemon exited with status: 271

We can fix this by using test_match_signal.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
peff authored and gitster committed Jul 6, 2016
1 parent 2472448 commit 03c39b3
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions t/lib-git-daemon.sh
Expand Up @@ -82,8 +82,7 @@ stop_git_daemon() {
kill "$GIT_DAEMON_PID"
wait "$GIT_DAEMON_PID" >&3 2>&4
ret=$?
# expect exit with status 143 = 128+15 for signal TERM=15
if test $ret -ne 143
if test_match_signal 15 $?
then
error "git daemon exited with status: $ret"
fi
Expand Down

0 comments on commit 03c39b3

Please sign in to comment.