Mike Frysinger wrote: > the new char-class-multibyte test fails with grep-2.6.1 on my system. i have > en_US.UTF8 on my system, but not the french utf8 locale. > > using gcc-4.4.3 and glibc-2.11 on x86_64. attaching the config.log. > -mike > > > FAIL: char-class-multibyte (exit: 1) > ==================================== > > --- out1-none 2010-03-25 23:23:42.000000000 -0400 > +++ exp1 2010-03-25 23:23:42.000000000 -0400 > @@ -0,0 +1 @@ > +é > --- out2-none 2010-03-25 23:23:42.000000000 -0400 > +++ exp2 2010-03-25 23:23:42.000000000 -0400 > @@ -0,0 +1 @@ > +É
Thanks to both of you for the reports. Here's a tentative patch: >From 189913f75b39f3136c825e317bceafe28618a94d Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Fri, 26 Mar 2010 07:24:48 +0100 Subject: [PATCH] tests: avoid spurious test failure due to lack of a French UTF8 locale * tests/init.cfg: New file. If either $LOCALE_FR or $LOCALE_FR_UTF8 is set to "none", reset it to the empty string. Reported by Mike Frysinger and Sven Joachim. * tests/Makefile.am (EXTRA_DIST): Add init.cfg. --- THANKS | 2 ++ tests/Makefile.am | 1 + tests/init.cfg | 5 +++++ 3 files changed, 8 insertions(+), 0 deletions(-) create mode 100644 tests/init.cfg diff --git a/THANKS b/THANKS index db792e6..084ded1 100644 --- a/THANKS +++ b/THANKS @@ -57,6 +57,7 @@ Mark Waite <[email protected]> Martin P.J. Zinser <[email protected]> Martin Rex <[email protected]> Michael Aichlmayr <[email protected]> +Mike Frysinger <[email protected]> Miles Bader <[email protected]> Olaf Kirch <[email protected]> Paolo Bonzini <[email protected]> @@ -72,6 +73,7 @@ Santiago Vila <[email protected]> Shannon Hill <[email protected]> Sotiris Vassilopoulos <[email protected]> Stewart Levin <[email protected]> +Sven Joachim <[email protected]> Sydoruk Stepan <[email protected]> Tapani Tarvainen <[email protected]> Tim Waugh <[email protected]> diff --git a/tests/Makefile.am b/tests/Makefile.am index 59ed672..17785bb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -52,6 +52,7 @@ EXTRA_DIST = \ bre.tests \ ere.awk \ ere.tests \ + init.cfg \ init.sh \ khadafy.lines \ khadafy.regexp \ diff --git a/tests/init.cfg b/tests/init.cfg new file mode 100644 index 0000000..6fec55e --- /dev/null +++ b/tests/init.cfg @@ -0,0 +1,5 @@ +# This file is sourced by init.sh, *before* its initialization. + +# Map settings of "none" to the empty string. +test _"$LOCALE_FR" = _none && LOCALE_FR= +test _"$LOCALE_FR_UTF8" = _none && LOCALE_FR_UTF8= -- 1.7.0.3.448.g82eeb
