admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

t9822: use prereq to check for ISO-8859-1 support

Browse Source 
Tests in t9822 depend on filesystem support for ISO-8859-1 encoding. We
thus have a block of code that acts as a prerequisite -- if we fail to
write a file with an ISO-8859-1-encoded file name to disk then we skip
all tests.

When the prerequisite fails though we end up printing an error message
to stderr, which breaks the TAP format. Fix this by converting the code
to a proper prerequisite, which handles output redirection for us.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-06-02 08:44:43 +02:00
committed by Junio C Hamano
parent ddfcb9d466
commit 844537091d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
t/t9822-git-p4-path-encoding.sh
View File

@@ -7,12 +7,17 @@ test_description='Clone repositories with non ASCII paths'
UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt" UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt"
ISO8859_ESCAPED="a-\344_o-\366_u-\374.txt" ISO8859_ESCAPED="a-\344_o-\366_u-\374.txt"
ISO8859="$(printf "$ISO8859_ESCAPED")" && test_lazy_prereq FS_ACCEPTS_ISO_8859_1 '
echo content123 >"$ISO8859" && ISO8859="$(printf "$ISO8859_ESCAPED")" &&
rm "$ISO8859" || { echo content123 >"$ISO8859" &&
rm "$ISO8859"
'
if ! test_have_prereq FS_ACCEPTS_ISO_8859_1
then
skip_all="fs does not accept ISO-8859-1 filenames" skip_all="fs does not accept ISO-8859-1 filenames"
test_done test_done
} fi
test_expect_success 'start p4d' ' test_expect_success 'start p4d' '
start_p4d start_p4d