зеркало из https://github.com/microsoft/git.git
tests: fix non-portable iconv invocation
The iconv that comes with a FreeBSD 11.2-RELEASE-p2 box I have access
to doesn't support the SHIFT-JIS encoding. Guard a test added in
e92d62253
("convert: add round trip check based on
'core.checkRoundtripEncoding'", 2018-04-15) first released with Git
v2.18.0 with a prerequisite that checks for its availability.
The iconv command is in POSIX, and we have numerous tests
unconditionally relying on its ability to convert ASCII, UTF-8 and
UTF-16, but unconditionally relying on the presence of more obscure
encodings isn't portable.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
de231e577b
Коммит
f6af6f9970
|
@ -203,7 +203,11 @@ test_expect_success 'error if encoding garbage is already in Git' '
|
|||
test_i18ngrep "error: BOM is required" err.out
|
||||
'
|
||||
|
||||
test_expect_success 'check roundtrip encoding' '
|
||||
test_lazy_prereq ICONV_SHIFT_JIS '
|
||||
iconv -f UTF-8 -t SHIFT-JIS </dev/null
|
||||
'
|
||||
|
||||
test_expect_success ICONV_SHIFT_JIS 'check roundtrip encoding' '
|
||||
test_when_finished "rm -f roundtrip.shift roundtrip.utf16" &&
|
||||
test_when_finished "git reset --hard HEAD" &&
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче