summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2016-06-13 19:35:09 +0700
committerJunio C Hamano <gitster@pobox.com>2016-06-13 11:50:44 -0700
commit44f243d356a6402878b2b3e098fd8cfa4fe1aaf5 (patch)
treebb9aece40a4305e746b606ebed3236138e5e2bfe
parent05219a1276341e72d8082d76b7f5ed394b7437a4 (diff)
downloadgit-nd/test-lib-httpd-show-error-log-in-verbose.tar.gz
lib-httpd.sh: print error.log on errornd/test-lib-httpd-show-error-log-in-verbose
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>
-rw-r--r--t/lib-httpd.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index f9f3e5fd82..ac2cbee250 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -180,6 +180,7 @@ start_httpd() {
if test $? -ne 0
then
trap 'die' EXIT
+ cat "$HTTPD_ROOT_PATH"/error.log >&4 2>/dev/null
test_skip_or_die $GIT_TEST_HTTPD "web server setup failed"
fi
}