t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met

gitster · gitster · commit b7d878075e75 · 2011-06-15T15:30:16.000-07:00
Linus noticed that we go ahead testing gitweb and fail miserably on a
box with Perl but not perl-CGI library. We already have a code to detect
lack of Perl and refrain from testing gitweb in t/gitweb-lib.sh (by the
way, shouldn't it be called t/lib-gitweb.sh?), so let's extend it
to cover this case as well.

Acked-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -107,4 +107,9 @@ perl -MEncode -e '$e="";decode_utf8($e, Encode::FB_CROAK)' >/dev/null 2>&1 \|\| {`
`107`	`107`	`test_done`
`108`	`108`	`}`
`109`	`109`
	`110`	`+perl -MCGI -MCGI::Util -MCGI::Carp -e 0 >/dev/null 2>&1 \|\| {`
	`111`	`+ skip_all='skipping gitweb tests, CGI module unusable'`
	`112`	`+ test_done`
	`113`	`+}`
	`114`	`+`
`110`	`115`	`gitweb_init`