Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t/lib-git-daemon: use test_match_signal
author
Jeff King
<peff@peff.net>
Fri, 24 Jun 2016 19:45:12 +0000
(15:45 -0400)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 6 Jul 2016 14:44:25 +0000
(07:44 -0700)
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>
t/lib-git-daemon.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
2472448
)
diff --git
a/t/lib-git-daemon.sh
b/t/lib-git-daemon.sh
index 340534c0644eb46782c0a95103bd2a3ef60da9f7..f9cbd4793194fbc38ec9a2bde0eafad748735044 100644
(file)
--- a/
t/lib-git-daemon.sh
+++ b/
t/lib-git-daemon.sh
@@
-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