git-svn: tests no longer fail if LC_ALL is not a UTF-8 locale

Signed-off-by: Eric Wong <normalperson@yhbt.net>

diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile
index d73aa5641c946b63591066f24c9b0e3b44b5148e..6aedb10f1261bbcef6a48ef65e1f47d9edc1afda 100644 (file)
--- a/contrib/git-svn/Makefile
+++ b/contrib/git-svn/Makefile
@@ -32,9 +32,10 @@ test: git-svn
        cd t && $(SHELL) ./t0000-contrib-git-svn.sh $(TEST_FLAGS)
        cd t && $(SHELL) ./t0001-contrib-git-svn-props.sh $(TEST_FLAGS)
 
+# we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
 full-test:
-       $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=1
-       $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=1
+       $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
+       $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
        $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \
                                                        LC_ALL=en_US.UTF-8
        $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \

diff --git a/contrib/git-svn/t/t0000-contrib-git-svn.sh b/contrib/git-svn/t/t0000-contrib-git-svn.sh
index f896e2c2a8587e0f2c5754f606d0885ccba6ca19..0f52746647a48cba2207e6596718f90b6920cf68 100644 (file)
--- a/contrib/git-svn/t/t0000-contrib-git-svn.sh
+++ b/contrib/git-svn/t/t0000-contrib-git-svn.sh
@@ -194,8 +194,12 @@ test_expect_success "$name" \
      diff -u a b"
 
 name='check imported tree checksums expected tree checksums'
-cat > expected <<\EOF
-tree f735671b89a7eb30cab1d8597de35bd4271ab813
+rm -f expected
+if test -n "$GIT_SVN_LC_ALL" && echo $GIT_SVN_LC_ALL | grep -q '\.UTF-8$'
+then
+       echo tree f735671b89a7eb30cab1d8597de35bd4271ab813 > expected
+fi
+cat >> expected <<\EOF
 tree 4b9af72bb861eaed053854ec502cf7df72618f0f
 tree 031b8d557afc6fea52894eaebb45bec52f1ba6d1
 tree 0b094cbff17168f24c302e297f55bfac65eb8bd3