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

* jk/do-not-run-httpd-tests-as-root: t/lib-httpd: require SANITY prereq
git-mirror · Jun 16, 2014 · fd80021 · fd80021
2 parents 499168a + a1a3011
commit fd80021
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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'