Re: git 1.6.1-rc4 testing dependency

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: git 1.6.1-rc4 testing dependency

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:49

Peter van der Does [off-list ref] writes:
On my building machine I don't have any locales installed, making the
LC_ALL=C.
Not everybody will have this locale installed nor would they want it
installed on their machines.
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.

In the meantime, perhaps "GIT_SKIP_TETS='t9129' make test" would help.

[PATCH] t9129: skip the last two tests if UTF-8 locale not available

From: Miklos Vajna <hidden>
Date: 2016-06-15 22:45:49

Signed-off-by: Miklos Vajna <redacted>
---

On Mon, Dec 22, 2008 at 12:50:49PM -0800, Junio C Hamano [off-list ref] 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help