Merge branch 'jc/maint-test-portability' into 'jc/test-portability'

gitster · gitster · commit ecd3e2f42504 · 2012-12-19T07:46:05.000-08:00
* jc/maint-test-portability:
  t4014: fix arguments to grep
  t9502: do not assume GNU tar
  t0200: "locale" may not exist
diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh
@@ -14,12 +14,14 @@ export GIT_TEXTDOMAINDIR GIT_PO_PATH
 if test_have_prereq GETTEXT && ! test_have_prereq GETTEXT_POISON
 then
 	# is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian
-	is_IS_locale=$(locale -a | sed -n '/^is_IS\.[uU][tT][fF]-*8$/{
+	is_IS_locale=$(locale -a 2>/dev/null |
+		sed -n '/^is_IS\.[uU][tT][fF]-*8$/{
 		p
 		q
 	}')
 	# is_IS.ISO8859-1 on Solaris and FreeBSD, is_IS.iso88591 on Debian
-	is_IS_iso_locale=$(locale -a | sed -n '/^is_IS\.[iI][sS][oO]8859-*1$/{
+	is_IS_iso_locale=$(locale -a 2>/dev/null |
+		sed -n '/^is_IS\.[iI][sS][oO]8859-*1$/{
 		p
 		q
 	}')
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
@@ -155,7 +155,7 @@ test_expect_failure 'additional command line cc (rfc822)' '
 	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
 	git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
 	grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 &&
-	grep "^ *"S. E. Cipient" <scipient@example.com>\$" patch5
+	grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" patch5
 '
 
 test_expect_success 'command line headers' '
@@ -183,7 +183,7 @@ test_expect_success 'command line To: header (ascii)' '
 test_expect_failure 'command line To: header (rfc822)' '
 
 	git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
-	grep "^To: "R. E. Cipient" <rcipient@example.com>\$" patch8
+	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch8
 '
 
 test_expect_failure 'command line To: header (rfc2047)' '
@@ -203,7 +203,7 @@ test_expect_failure 'configuration To: header (rfc822)' '
 
 	git config format.to "R. E. Cipient <rcipient@example.com>" &&
 	git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
-	grep "^To: "R. E. Cipient" <rcipient@example.com>\$" patch9
+	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch9
 '
 
 test_expect_failure 'configuration To: header (rfc2047)' '
diff --git a/t/t9502-gitweb-standalone-parse-output.sh b/t/t9502-gitweb-standalone-parse-output.sh
@@ -40,7 +40,7 @@ check_snapshot () {
 	echo "basename=$basename"
 	grep "filename=.*$basename.tar" gitweb.headers >/dev/null 2>&1 &&
 	"$TAR" tf gitweb.body >file_list &&
-	! grep -v "^$prefix/" file_list
+	! grep -v -e "^$prefix$" -e "^$prefix/" -e "^pax_global_header$" file_list
 }
 
 test_expect_success setup '

Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,14 @@ export GIT_TEXTDOMAINDIR GIT_PO_PATH`
`14`	`14`	`if test_have_prereq GETTEXT && ! test_have_prereq GETTEXT_POISON`
`15`	`15`	`then`
`16`	`16`	`# is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian`
`17`		`- is_IS_locale=$(locale -a \| sed -n '/^is_IS\.[uU][tT][fF]-*8$/{`
	`17`	`+ is_IS_locale=$(locale -a 2>/dev/null \|`
	`18`	`+ sed -n '/^is_IS\.[uU][tT][fF]-*8$/{`
`18`	`19`	`p`
`19`	`20`	`q`
`20`	`21`	`}')`
`21`	`22`	`# is_IS.ISO8859-1 on Solaris and FreeBSD, is_IS.iso88591 on Debian`
`22`		`- is_IS_iso_locale=$(locale -a \| sed -n '/^is_IS\.[iI][sS][oO]8859-*1$/{`
	`23`	`+ is_IS_iso_locale=$(locale -a 2>/dev/null \|`
	`24`	`+ sed -n '/^is_IS\.[iI][sS][oO]8859-*1$/{`
`23`	`25`	`p`
`24`	`26`	`q`
`25`	`27`	`}')`
-Original file line number
+Diff line change
 	git config --replace-all format.headers "Cc: R E Cipient <[email protected]>" &&
 	git format-patch --cc="S. E. Cipient <[email protected]>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
 	grep "^Cc: R E Cipient <[email protected]>,\$" patch5 &&
 -	grep "^ *"S. E. Cipient" <[email protected]>\$" patch5
 +	grep "^ *\"S. E. Cipient\" <[email protected]>\$" patch5
+'
 test_expect_success 'command line headers' '
 test_expect_failure 'command line To: header (rfc822)' '
 	git format-patch --to="R. E. Cipient <[email protected]>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
 -	grep "^To: "R. E. Cipient" <[email protected]>\$" patch8
 +	grep "^To: \"R. E. Cipient\" <[email protected]>\$" patch8
+'
 test_expect_failure 'command line To: header (rfc2047)' '
 	git config format.to "R. E. Cipient <[email protected]>" &&
 	git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
 -	grep "^To: "R. E. Cipient" <[email protected]>\$" patch9
 +	grep "^To: \"R. E. Cipient\" <[email protected]>\$" patch9
+'
 test_expect_failure 'configuration To: header (rfc2047)' '
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ check_snapshot () {`
`40`	`40`	`echo "basename=$basename"`
`41`	`41`	`grep "filename=.*$basename.tar" gitweb.headers >/dev/null 2>&1 &&`
`42`	`42`	`"$TAR" tf gitweb.body >file_list &&`
`43`		`- ! grep -v "^$prefix/" file_list`
	`43`	`+ ! grep -v -e "^$prefix$" -e "^$prefix/" -e "^pax_global_header$" file_list`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`test_expect_success setup '`