Skip to content

Commit

Permalink
t0028: extract encoding helpers to lib-encoding.sh
Browse files Browse the repository at this point in the history
The following patch will add tests outside t0028 which will also need to
re-encode some strings. Extract the auxiliary encoding functions from
t0028 to a common lib file so that they can be reused.

Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
matheustavares authored and gitster committed May 5, 2021
1 parent 6a7bc9d commit 2fa3cba
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 24 deletions.
25 changes: 25 additions & 0 deletions t/lib-encoding.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Encoding helpers

test_lazy_prereq NO_UTF16_BOM '
test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6
'

test_lazy_prereq NO_UTF32_BOM '
test $(printf abc | iconv -f UTF-8 -t UTF-32 | wc -c) = 12
'

write_utf16 () {
if test_have_prereq NO_UTF16_BOM
then
printf '\376\377'
fi &&
iconv -f UTF-8 -t UTF-16
}

write_utf32 () {
if test_have_prereq NO_UTF32_BOM
then
printf '\0\0\376\377'
fi &&
iconv -f UTF-8 -t UTF-32
}
25 changes: 1 addition & 24 deletions t/t0028-working-tree-encoding.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,10 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

. ./test-lib.sh
. "$TEST_DIRECTORY/lib-encoding.sh"

GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING

test_lazy_prereq NO_UTF16_BOM '
test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6
'

test_lazy_prereq NO_UTF32_BOM '
test $(printf abc | iconv -f UTF-8 -t UTF-32 | wc -c) = 12
'

write_utf16 () {
if test_have_prereq NO_UTF16_BOM
then
printf '\376\377'
fi &&
iconv -f UTF-8 -t UTF-16
}

write_utf32 () {
if test_have_prereq NO_UTF32_BOM
then
printf '\0\0\376\377'
fi &&
iconv -f UTF-8 -t UTF-32
}

test_expect_success 'setup test files' '
git config core.eol lf &&
Expand Down

0 comments on commit 2fa3cba

Please sign in to comment.