summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-23 22:17:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-23 22:17:14 (GMT)
commit02c2c60e2ab74aad202644b40338c4ff008419b3 (patch)
treedfb0f72e836b372903fd4a26c5e3dda6dd58cebe /t
parent1be9d84b2ed18c2b2e2d6a459d2b6d48d5ab86e5 (diff)
parentb7d878075e751859ff344c8334ae016228676c4d (diff)
downloadgit-02c2c60e2ab74aad202644b40338c4ff008419b3.zip
git-02c2c60e2ab74aad202644b40338c4ff008419b3.tar.gz
git-02c2c60e2ab74aad202644b40338c4ff008419b3.tar.bz2
Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maint
* jc/no-gitweb-test-without-cgi-etc: t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
Diffstat (limited to 't')
-rw-r--r--t/gitweb-lib.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh
index 143eb1f..292753f 100644
--- a/t/gitweb-lib.sh
+++ b/t/gitweb-lib.sh
@@ -107,4 +107,9 @@ perl -MEncode -e '$e="";decode_utf8($e, Encode::FB_CROAK)' >/dev/null 2>&1 || {
test_done
}
+perl -MCGI -MCGI::Util -MCGI::Carp -e 0 >/dev/null 2>&1 || {
+ skip_all='skipping gitweb tests, CGI module unusable'
+ test_done
+}
+
gitweb_init