Include LOCPATH in default test environment

Message ID lnc7rr$gjq$1@ger.gmane.org
State Committed
Headers

Commit Message

Stefan Liebler June 12, 2014, 12:53 p.m. UTC
  On 06/10/2014 04:00 PM, Andreas Schwab wrote:
> Stefan Liebler <stli@linux.vnet.ibm.com> writes:
>
>> tst-strcoll-overflow (make xtests) is failing (on s390) due to this
>> commit. The test sets locale en-GB.UTF-8, which does not exist in
>> localedata-path and the test exits without testing strcoll.
>
> That means localedata/Makefile:LOCALES needs to be updated.
>
> Andreas.
>
Hi,

this patch generates en_GB.UTF-8, which is used in tst-strcoll-overflow.
This solves the issue on s390/s390x.
Please retest and commit.

Bye

---
2014-06-12  Stefan Liebler  <stli@linux.vnet.ibm.com>

	* Makefile (LOCALES): Add en_GB.UTF-8.
---
  

Comments

Joseph Myers June 19, 2014, 10:05 p.m. UTC | #1
On Thu, 12 Jun 2014, Stefan Liebler wrote:

> 2014-06-12  Stefan Liebler  <stli@linux.vnet.ibm.com>
> 
> 	* Makefile (LOCALES): Add en_GB.UTF-8.

OK.
  
Siddhesh Poyarekar June 20, 2014, 2:34 a.m. UTC | #2
On Thu, Jun 19, 2014 at 10:05:21PM +0000, Joseph S. Myers wrote:
> On Thu, 12 Jun 2014, Stefan Liebler wrote:
> 
> > 2014-06-12  Stefan Liebler  <stli@linux.vnet.ibm.com>
> > 
> > 	* Makefile (LOCALES): Add en_GB.UTF-8.
> 
> OK.
> 

Pushed.

Siddhesh
  
Joseph Myers June 20, 2014, 11:32 a.m. UTC | #3
On Fri, 20 Jun 2014, Siddhesh Poyarekar wrote:

> On Thu, Jun 19, 2014 at 10:05:21PM +0000, Joseph S. Myers wrote:
> > On Thu, 12 Jun 2014, Stefan Liebler wrote:
> > 
> > > 2014-06-12  Stefan Liebler  <stli@linux.vnet.ibm.com>
> > > 
> > > 	* Makefile (LOCALES): Add en_GB.UTF-8.
> > 
> > OK.
> > 
> 
> Pushed.

That ChangeLog entry was for localedata/ChangeLog, not the toplevel 
ChangeLog.
  

Patch

diff --git a/localedata/Makefile b/localedata/Makefile
index 76eeedf..939cc3d 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -105,7 +105,7 @@  LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
 	   hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
 	   nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 tr_TR.UTF-8 cs_CZ.UTF-8 \
 	   zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 si_LK.UTF-8 \
-	   tr_TR.ISO-8859-9
+	   tr_TR.ISO-8859-9 en_GB.UTF-8
 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
 CHARMAPS := $(shell echo "$(LOCALES)" | \
 		    sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g)