Commit 924f6c3d authored by Torsten Bögershausen's avatar Torsten Bögershausen Committed by Junio C Hamano

test-bzr: portable shell and utf-8 strings for Mac OS

Make the shell script more portable:
- Split export X=Y into 2 lines
- Use printf instead of echo -e

Use UTF-8 code points which are not decomposed by the filesystem:
 Code points like "á" will be decomposed by Mac OS X.
 bzr is unable to find the file "á" on disk.
 Use code points from unicode which can not be decomposed.
 In other words, the precompsed form use the same bytes as decomposed.
Signed-off-by: default avatarTorsten Bögershausen <tboegi@web.de>
Acked-by: Felipe Contreras's avatarFelipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent caa7d79f
......@@ -169,31 +169,30 @@ test_expect_success 'fetch utf-8 filenames' '
mkdir -p tmp && cd tmp &&
test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
export LC_ALL=en_US.UTF-8
LC_ALL=en_US.UTF-8
export LC_ALL
(
bzr init bzrrepo &&
cd bzrrepo &&
echo test >> "áéíóú" &&
bzr add "áéíóú" &&
echo test >> "îø∫∆" &&
bzr add "îø∫∆" &&
bzr commit -m utf-8 &&
echo test >> "áéíóú" &&
bzr commit -m utf-8 &&
bzr rm "îø∫∆" &&
bzr mv "áéíóú" "åß∂" &&
bzr commit -m utf-8
echo test >> "ærø" &&
bzr add "ærø" &&
echo test >> "ø~?" &&
bzr add "ø~?" &&
bzr commit -m add-utf-8 &&
echo test >> "ærø" &&
bzr commit -m test-utf-8 &&
bzr rm "ø~?" &&
bzr mv "ærø" "ø~?" &&
bzr commit -m bzr-mv-utf-8
) &&
(
git clone "bzr::$PWD/bzrrepo" gitrepo &&
cd gitrepo &&
git ls-files > ../actual
git -c core.quotepath=false ls-files > ../actual
) &&
echo "\"\\303\\245\\303\\237\\342\\210\\202\"" > expected &&
echo "ø~?" > expected &&
test_cmp expected actual
'
......@@ -201,7 +200,8 @@ test_expect_success 'push utf-8 filenames' '
mkdir -p tmp && cd tmp &&
test_when_finished "cd .. && rm -rf tmp && LC_ALL=C" &&
export LC_ALL=en_US.UTF-8
LC_ALL=en_US.UTF-8
export LC_ALL
(
bzr init bzrrepo &&
......@@ -216,15 +216,15 @@ test_expect_success 'push utf-8 filenames' '
git clone "bzr::$PWD/bzrrepo" gitrepo &&
cd gitrepo &&
echo test >> "áéíóú" &&
git add "áéíóú" &&
echo test >> "ærø" &&
git add "ærø" &&
git commit -m utf-8 &&
git push
) &&
(cd bzrrepo && bzr ls > ../actual) &&
echo -e "content\náéíóú" > expected &&
printf "content\nærø\n" > expected &&
test_cmp expected actual
'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment