undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t9100, t9129: Use prerequisite tags for UTF-8 tests

Browse Source 
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
This commit is contained in:
Johannes Sixt 2009-02-24 21:13:39 +01:00
parent 18bf879817
commit 7b7247b0d7
2 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
t/t9100-git-svn-basic.sh
View File

@ -6,19 +6,19 @@
test_description='git svn basic tests'
GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
case "$GIT_SVN_LC_ALL" in
*.UTF-8)
have_utf8=t
;;
*)
have_utf8=
;;
esac
. ./lib-git-svn.sh
say 'define NO_SVN_TESTS to skip git svn tests'
case "$GIT_SVN_LC_ALL" in
*.UTF-8)
test_set_prereq UTF8
;;
*)
say "UTF-8 locale not set, some tests skipped ($GIT_SVN_LC_ALL)"
;;
esac
test_expect_success \
'initialize git svn' '
mkdir import &&
@ -171,20 +171,15 @@ test_expect_success "$name" '
test ! -L "$SVN_TREE"/exec-2.sh &&
test_cmp help "$SVN_TREE"/exec-2.sh'
if test "$have_utf8" = t
then
name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
LC_ALL="$GIT_SVN_LC_ALL"
export LC_ALL
test_expect_success "$name" "
echo '# hello' >> exec-2.sh &&
git update-index exec-2.sh &&
git commit -m 'éï∏' &&
git svn set-tree HEAD"
unset LC_ALL
else
say "UTF-8 locale not set, test skipped ($GIT_SVN_LC_ALL)"
fi
name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
LC_ALL="$GIT_SVN_LC_ALL"
export LC_ALL
test_expect_success UTF8 "$name" "
echo '# hello' >> exec-2.sh &&
git update-index exec-2.sh &&
git commit -m 'éï∏' &&
git svn set-tree HEAD"
unset LC_ALL
name='test fetch functionality (svn => git) with alternate GIT_SVN_ID'
GIT_SVN_ID=alt
@ -197,7 +192,7 @@ test_expect_success "$name" \
name='check imported tree checksums expected tree checksums'
rm -f expected
if test "$have_utf8" = t
if test_have_prereq UTF8
then
echo tree bf522353586b1b883488f2bc73dab0d9f774b9a9 > expected
fi

34
t/t9129-git-svn-i18n-commitencoding.sh
View File

@ -70,24 +70,26 @@ do
done
if locale -a |grep -q en_US.utf8; then
test_expect_success 'ISO-8859-1 should match UTF-8 in svn' '
(
cd ISO-8859-1 &&
compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
)
'
for H in EUCJP ISO-2022-JP
do
test_expect_success '$H should match UTF-8 in svn' '
(
cd $H &&
compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
)
'
done
test_set_prereq UTF8
else
say "UTF-8 locale not available, test skipped"
fi
test_expect_success UTF8 'ISO-8859-1 should match UTF-8 in svn' '
(
cd ISO-8859-1 &&
compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
)
'
for H in EUCJP ISO-2022-JP
do
test_expect_success UTF8 "$H should match UTF-8 in svn" '
(
cd $H &&
compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
)
'
done
test_done