Merge branch 'bg/maint-gitweb-test-lib' into maint

gitster · gitster · commit 1f238da57334 · 2010-12-02T11:26:49.000-08:00
* bg/maint-gitweb-test-lib:
  t/gitweb-lib: Don't pass constant to decode_utf8
diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh
@@ -80,7 +80,7 @@ if ! test_have_prereq PERL; then
 	test_done
 fi
 
-perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || {
+perl -MEncode -e '$e="";decode_utf8($e, Encode::FB_CROAK)' >/dev/null 2>&1 || {
     skip_all='skipping gitweb tests, perl version is too old'
     test_done
 }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ if ! test_have_prereq PERL; then`
`80`	`80`	`test_done`
`81`	`81`	`fi`
`82`	`82`
`83`		`-perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 \|\| {`
	`83`	`+perl -MEncode -e '$e="";decode_utf8($e, Encode::FB_CROAK)' >/dev/null 2>&1 \|\| {`
`84`	`84`	`skip_all='skipping gitweb tests, perl version is too old'`
`85`	`85`	`test_done`
`86`	`86`	`}`