From: Miklos Vajna <vmiklos@frugalware.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Peter van der Does <peter@ourvirtualhome.com>, git@vger.kernel.org
Subject: [PATCH] t9129: skip the last two tests if UTF-8 locale not available
Date: Tue, 23 Dec 2008 02:09:24 +0100 [thread overview]
Message-ID: <1229994564-5153-1-git-send-email-vmiklos@frugalware.org> (raw)
In-Reply-To: <7vzliogcie.fsf@gitster.siamese.dyndns.org>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
On Mon, Dec 22, 2008 at 12:50:49PM -0800, Junio C Hamano <gitster@pobox.com> 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
next prev parent reply other threads:[~2008-12-23 1:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-22 15:06 git 1.6.1-rc4 testing dependency Peter van der Does
2008-12-22 20:50 ` Junio C Hamano
2008-12-23 1:09 ` Miklos Vajna [this message]
2008-12-23 1:52 ` [PATCH] t9129: skip the last two tests if UTF-8 locale not available Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1229994564-5153-1-git-send-email-vmiklos@frugalware.org \
--to=vmiklos@frugalware.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peter@ourvirtualhome.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).