Merge branch 'jk/do-not-run-httpd-tests-as-root'

* jk/do-not-run-httpd-tests-as-root:
  t/lib-httpd: require SANITY prereq
This commit is contained in:
Junio C Hamano 2014-06-16 10:06:05 -07:00
commit fd80021438

View file

@ -37,6 +37,11 @@ then
test_done
fi
if ! test_have_prereq SANITY; then
test_skip_or_die $GIT_TEST_HTTPD \
"Cannot run httpd tests as root"
fi
HTTPD_PARA=""
for DEFAULT_HTTPD_PATH in '/usr/sbin/httpd' '/usr/sbin/apache2'