lib-httpd.sh: print error.log on error

Failure to bring up httpd for testing is not considered an error, so the
trash directory, which contains this error.log file, is removed and we
don't know what made httpd fail to start. Improve the situation a bit,
print error.log but only in verbose mode.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2016-06-13 19:35:09 +07:00 committed by Junio C Hamano
parent 05219a1276
commit 44f243d356
1 changed files with 1 additions and 0 deletions

View File

@ -180,6 +180,7 @@ start_httpd() {
if test $? -ne 0 if test $? -ne 0
then then
trap 'die' EXIT trap 'die' EXIT
cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
test_skip_or_die $GIT_TEST_HTTPD "web server setup failed" test_skip_or_die $GIT_TEST_HTTPD "web server setup failed"
fi fi
} }