844537091d
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>
83 lines
1.9 KiB
Bash
Executable File
83 lines
1.9 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Clone repositories with non ASCII paths'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt"
|
|
ISO8859_ESCAPED="a-\344_o-\366_u-\374.txt"
|
|
|
|
test_lazy_prereq FS_ACCEPTS_ISO_8859_1 '
|
|
ISO8859="$(printf "$ISO8859_ESCAPED")" &&
|
|
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"
|
|
test_done
|
|
fi
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'Create a repo containing iso8859-1 encoded paths' '
|
|
(
|
|
cd "$cli" &&
|
|
ISO8859="$(printf "$ISO8859_ESCAPED")" &&
|
|
echo content123 >"$ISO8859" &&
|
|
p4 add "$ISO8859" &&
|
|
p4 submit -d "test commit"
|
|
)
|
|
'
|
|
|
|
test_expect_failure 'Clone auto-detects depot with iso8859-1 paths' '
|
|
git p4 clone --destination="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
UTF8="$(printf "$UTF8_ESCAPED")" &&
|
|
echo "$UTF8" >expect &&
|
|
git -c core.quotepath=false ls-files >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'Clone repo containing iso8859-1 encoded paths with git-p4.pathEncoding' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git init . &&
|
|
git config git-p4.pathEncoding iso8859-1 &&
|
|
git p4 clone --use-client-spec --destination="$git" //depot &&
|
|
UTF8="$(printf "$UTF8_ESCAPED")" &&
|
|
echo "$UTF8" >expect &&
|
|
git -c core.quotepath=false ls-files >actual &&
|
|
test_cmp expect actual &&
|
|
|
|
echo content123 >expect &&
|
|
cat "$UTF8" >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'Delete iso8859-1 encoded paths and clone' '
|
|
(
|
|
cd "$cli" &&
|
|
ISO8859="$(printf "$ISO8859_ESCAPED")" &&
|
|
p4 delete "$ISO8859" &&
|
|
p4 submit -d "remove file"
|
|
) &&
|
|
git p4 clone --destination="$git" //depot@all &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git -c core.quotepath=false ls-files >actual &&
|
|
test_must_be_empty actual
|
|
)
|
|
'
|
|
|
|
test_done
|