t3900: use ancient iconv names for backward compatibility
Some old iconv implementations do not have many alternate names and/or
do not match character encoding names case insensitively. These
implementations can not tell that utf-8 and UTF-8 are the same encoding
and fail when trying to do the conversion. So use the old names, which
modern implementations still support.
The following conversions were performed:
utf-8 --> UTF-8
ISO-8859-1 --> ISO8859-1
EUCJP --> eucJP
Also update t9129 and t9500 which make use of the test files in t/t3900.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
99ddd24ad7
commit
5ae93dfdcc
@@ -29,7 +29,7 @@ compare_svn_head_with () {
|
||||
test_cmp current "$1"
|
||||
}
|
||||
|
||||
for H in ISO-8859-1 EUCJP ISO-2022-JP
|
||||
for H in ISO8859-1 eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "$H setup" '
|
||||
mkdir $H &&
|
||||
@@ -38,7 +38,7 @@ do
|
||||
'
|
||||
done
|
||||
|
||||
for H in ISO-8859-1 EUCJP ISO-2022-JP
|
||||
for H in ISO8859-1 eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "$H commit on git side" '
|
||||
(
|
||||
@@ -55,7 +55,7 @@ do
|
||||
'
|
||||
done
|
||||
|
||||
for H in ISO-8859-1 EUCJP ISO-2022-JP
|
||||
for H in ISO8859-1 eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "$H dcommit to svn" '
|
||||
(
|
||||
@@ -77,12 +77,12 @@ fi
|
||||
|
||||
test_expect_success UTF8 'ISO-8859-1 should match UTF-8 in svn' '
|
||||
(
|
||||
cd ISO-8859-1 &&
|
||||
cd ISO8859-1 &&
|
||||
compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
|
||||
)
|
||||
'
|
||||
|
||||
for H in EUCJP ISO-2022-JP
|
||||
for H in eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success UTF8 "$H should match UTF-8 in svn" '
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user