From: Eric Wong Date: Mon, 22 Feb 2016 02:55:09 GMT Subject: [PATCH v4 1/3] git-svn: hoist out utf8 prep from t9129 to lib-git-svn Message-ID: <1456109711-26866-2-git-send-email-normalperson@yhbt.net> In-Reply-To: <1456109711-26866-1-git-send-email-normalperson@yhbt.net> We will be reusing this in t9115. Suggested-by: Kazutoshi Satoda Signed-off-by: Eric Wong --- t/lib-git-svn.sh | 12 ++++++++++++ t/t9129-git-svn-i18n-commitencoding.sh | 12 +----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index b0ec12f..6a50b87 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -186,3 +186,15 @@ start_svnserve () { --listen-host 127.0.0.1 & } +prepare_a_utf8_locale () { + 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 +} diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh index 39b6bcb..8dbd647 100755 --- a/t/t9129-git-svn-i18n-commitencoding.sh +++ b/t/t9129-git-svn-i18n-commitencoding.sh @@ -14,17 +14,7 @@ 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 +prepare_a_utf8_locale compare_svn_head_with () { # extract just the log message and strip out committer info. -- EW