diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:06:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:06:05 -0700 |
| commit | fd800214384e60cc72272620bdde58f94746719e (patch) | |
| tree | 43ffe7c4fe9c20396c02b21bca1ebe9226669c66 /t | |
| parent | 499168af3b2a21e2d234a2093cb3c0f64e2f36a0 (diff) | |
| parent | a1a301114e0ba3f60474d857c93d02890d00e65b (diff) | |
| download | git-fd800214384e60cc72272620bdde58f94746719e.tar.gz | |
Merge branch 'jk/do-not-run-httpd-tests-as-root'
* jk/do-not-run-httpd-tests-as-root:
t/lib-httpd: require SANITY prereq
Diffstat (limited to 't')
| -rw-r--r-- | t/lib-httpd.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 252cbf163b..8b67021a6b 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -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' |