From: Miklos Vajna Date: Tue, 23 Dec 2008 01:09:24 GMT Subject: [PATCH] t9129: skip the last two tests if UTF-8 locale not available Message-ID: <1229994564-5153-1-git-send-email-vmiklos@frugalware.org> In-Reply-To: <7vzliogcie.fsf@gitster.siamese.dyndns.org> Signed-off-by: Miklos Vajna --- On Mon, Dec 22, 2008 at 12:50:49PM -0800, Junio C Hamano wrote: > I think some tests play nicer than this one and skip tests that want > UTF-8 locales; you may want to teach this script the same trick. What about this? Tesed on two Linux boxes (where I have / do not have UTF-8) and HP-UX (where I do not have, either). t/t9129-git-svn-i18n-commitencoding.sh | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh index 938b7fe..8a9dde4 100755 --- a/t/t9129-git-svn-i18n-commitencoding.sh +++ b/t/t9129-git-svn-i18n-commitencoding.sh @@ -60,21 +60,25 @@ do ' done -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' ' +if locale -a |grep -q en_US.utf8; then + test_expect_success 'ISO-8859-1 should match UTF-8 in svn' ' ( - cd $H && - compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt + cd ISO-8859-1 && + compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt ) ' -done + + 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 +else + say "UTF-8 locale not available, test skipped" +fi test_done -- 1.6.1.rc1.35.gae26e.dirty