diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-28 19:38:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-29 17:35:05 (GMT) |
| commit | f6af6f9970cfd385b1e7aae12d86a6fcff814e33 (patch) | |
| tree | 263233e1e91c44e83a6a182d66316414f6715daa /t | |
| parent | de231e577b6d685bd4457450af7129ddd8892269 (diff) | |
| download | git-f6af6f9970cfd385b1e7aae12d86a6fcff814e33.zip git-f6af6f9970cfd385b1e7aae12d86a6fcff814e33.tar.gz git-f6af6f9970cfd385b1e7aae12d86a6fcff814e33.tar.bz2 | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0028-working-tree-encoding.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh index 12b8eb9..7e87b5a 100755 --- a/t/t0028-working-tree-encoding.sh +++ b/t/t0028-working-tree-encoding.sh @@ -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" && |