undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/grep-binary-workaround-in-test' into maint

Browse Source 
Recent versions of GNU grep are pickier when their input contains
arbitrary binary data, which some of our tests uses.  Rewrite the
tests to sidestep the problem.

* jk/grep-binary-workaround-in-test:
  t9200: avoid grep on non-ASCII data
  t8005: avoid grep on non-ASCII data
This commit is contained in:
Junio C Hamano 2016-03-10 11:13:45 -08:00
commit 7f18fadcbc
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
t/t8005-blame-i18n.sh
View File

@ -33,11 +33,15 @@ author $SJIS_NAME
summary $SJIS_MSG
EOF
filter_author_summary () {
sed -n -e '/^author /p' -e '/^summary /p' "$@"
}
test_expect_success !MINGW \
'blame respects i18n.commitencoding' '
git blame --incremental file | \
egrep "^(author|summary) " > actual &&
test_cmp actual expected
git blame --incremental file >output &&
filter_author_summary output >actual &&
test_cmp expected actual
'
cat >expected <<EOF
@ -52,9 +56,9 @@ EOF
test_expect_success !MINGW \
'blame respects i18n.logoutputencoding' '
git config i18n.logoutputencoding eucJP &&
git blame --incremental file | \
egrep "^(author|summary) " > actual &&
test_cmp actual expected
git blame --incremental file >output &&
filter_author_summary output >actual &&
test_cmp expected actual
'
cat >expected <<EOF
@ -68,9 +72,9 @@ EOF
test_expect_success !MINGW \
'blame respects --encoding=UTF-8' '
git blame --incremental --encoding=UTF-8 file | \
egrep "^(author|summary) " > actual &&
test_cmp actual expected
git blame --incremental --encoding=UTF-8 file >output &&
filter_author_summary output >actual &&
test_cmp expected actual
'
cat >expected <<EOF
@ -84,9 +88,9 @@ EOF
test_expect_success !MINGW \
'blame respects --encoding=none' '
git blame --incremental --encoding=none file | \
egrep "^(author|summary) " > actual &&
test_cmp actual expected
git blame --incremental --encoding=none file >output &&
filter_author_summary output >actual &&
test_cmp expected actual
'
test_done

2
t/t9200-git-cvsexportcommit.sh
View File

@ -35,7 +35,7 @@ exit 1
check_entries () {
# $1 == directory, $2 == expected
grep '^/' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
sed -ne '/^\//p' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
if test -z "$2"
then
>expected