Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maint

gitster · gitster · commit 02c2c60e2ab7 · 2011-08-23T15:17:14.000-07:00
* jc/no-gitweb-test-without-cgi-etc:
  t/gitweb-lib.sh: skip gitweb tests when perl dependencies are not met
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`