diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-22 08:31:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 08:31:53 -0700 |
| commit | a8c4d925caba244de842f8fa663c3e6bb7000b89 (patch) | |
| tree | 012e344bccee07cff35a996970b583312075407b | |
| parent | Merge branch 'cb/ls-files-cdup' into maint (diff) | |
| parent | t9129: fix UTF-8 locale detection (diff) | |
| download | tgif-a8c4d925caba244de842f8fa663c3e6bb7000b89.tar.xz | |
Merge branch 'jc/t9129-any-utf8' into maint
* jc/t9129-any-utf8:
t9129: fix UTF-8 locale detection
| -rwxr-xr-x | t/t9129-git-svn-i18n-commitencoding.sh | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh index b9224bdb20..1e9a2eb12b 100755 --- a/t/t9129-git-svn-i18n-commitencoding.sh +++ b/t/t9129-git-svn-i18n-commitencoding.sh @@ -14,10 +14,22 @@ compare_git_head_with () { test_cmp current "$1" } +a_utf8_locale=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{ + p + q +}') + +if test -n "$a_utf8_locale" +then + test_set_prereq UTF8 +else + say "UTF-8 locale not available, some tests are skipped" +fi + compare_svn_head_with () { # extract just the log message and strip out committer info. # don't use --limit here since svn 1.1.x doesn't have it, - LC_ALL=en_US.UTF-8 svn log `git svn info --url` | perl -w -e ' + LC_ALL="$a_utf8_locale" svn log `git svn info --url` | perl -w -e ' use bytes; $/ = ("-"x72) . "\n"; my @x = <STDIN>; @@ -69,12 +81,6 @@ do ' done -if locale -a |grep -q en_US.utf8; then - 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 ISO8859-1 && |