git 1.6.1-rc4 testing dependency

git 1.6.1-rc4 testing dependency

[Peter van der Does]

[-- Attachment #1: Type: text/plain, Size: 799 bytes --]

With git 1.6.1 it it seems you need to install the locale en_US.UTF-8
otherwise it won't pass the testing during building the package. 

The locale comes in play with test:
t9129-git-svn-i18n-commitencoding.sh 
compare_svn_head_with () {
        LC_ALL=en_US.UTF-8 svn log --limit 1 `git svn info --url` | \
                sed -e 1,3d -e "/^-\{1,\}\$/d" >current &&
        test_cmp current "$1"
}

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.
Is the locale is a dependency for git svn?
Or can this test be changed? Either by not having the locale dependency
or by skipping the test completely?


-- 
Peter van der Does

GPG key: E77E8E98


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

git 1.6.1-rc4 testing dependency

[Peter van der Does]

With git 1.6.1 it it seems you need to install the locale en_US.UTF-8
otherwise it won't pass the testing during building the package. 

The locale comes in play with test:
t9129-git-svn-i18n-commitencoding.sh 
compare_svn_head_with () {
        LC_ALL=en_US.UTF-8 svn log --limit 1 `git svn info --url` | \
                sed -e 1,3d -e "/^-\{1,\}\$/d" >current &&
        test_cmp current "$1"
}

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.
Is the locale is a dependency for git svn?
Or can this test be changed? Either by not having the locale dependency
or by skipping the test completely?

I apologize if this message shows up twice.
-- 
Peter van der Does

GPG key: E77E8E98

Re: git 1.6.1-rc4 testing dependency

[Junio C Hamano]

Peter van der Does <peter@ourvirtualhome.com> 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

[Miklos Vajna]

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

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

[Junio C Hamano]

Miklos Vajna <vmiklos@frugalware.org> writes:

> 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).

Thanks.

Peter, is this the only test that you had trouble with, and does Miklos's
patch help your environment?