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:
commit
fd80021438
@ -37,6 +37,11 @@ then
|
|||||||
test_done
|
test_done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if ! test_have_prereq SANITY; then
|
||||||
|
test_skip_or_die $GIT_TEST_HTTPD \
|
||||||
|
"Cannot run httpd tests as root"
|
||||||
|
fi
|
||||||
|
|
||||||
HTTPD_PARA=""
|
HTTPD_PARA=""
|
||||||
|
|
||||||
for DEFAULT_HTTPD_PATH in '/usr/sbin/httpd' '/usr/sbin/apache2'
|
for DEFAULT_HTTPD_PATH in '/usr/sbin/httpd' '/usr/sbin/apache2'
|
||||||
|
Loading…
Reference in New Issue
Block a user