summaryrefslogtreecommitdiff
path: root/t/lib-httpd.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:38:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:38:08 -0700
commit34bf3bbb304cabf4ae65e6b815d9690973668194 (patch)
tree493a978bd895c517ec18e525bc1b008254660f6f /t/lib-httpd.sh
parentMerge branch 'jk/string-list-static-init' (diff)
parentlib-httpd.sh: print error.log on error (diff)
downloadtgif-34bf3bbb304cabf4ae65e6b815d9690973668194.tar.xz
Merge branch 'nd/test-lib-httpd-show-error-log-in-verbose'
HTTPd tests learned to show the server error log to help diagnosing a failing tests. * nd/test-lib-httpd-show-error-log-in-verbose: lib-httpd.sh: print error.log on error
Diffstat (limited to 't/lib-httpd.sh')
-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
}