Merge branch 'sk/wincred'

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 252cbf163bcff90aabe39a48219e00565f577ffe..8b67021a6bb95c8a2e6ed2530267e338f2351082 100644 (file)
--- 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'