diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2013-04-19 11:25:25 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2013-04-19 11:25:25 +0300 |
| commit | 48e8090a8d94726d3d57fdf6b79930acbab0a73b (patch) | |
| tree | 5b38554de90c0979e5a79755177318df06581dd6 | |
| parent | fc9ff1b7115e5b44b34f0694e099d51b75b2aac3 (diff) | |
| download | egawk-48e8090a8d94726d3d57fdf6b79930acbab0a73b.tar.gz egawk-48e8090a8d94726d3d57fdf6b79930acbab0a73b.tar.bz2 egawk-48e8090a8d94726d3d57fdf6b79930acbab0a73b.zip | |
Fix 'next' test to be locale-independent.
| -rw-r--r-- | test/ChangeLog | 7 | ||||
| -rw-r--r-- | test/Makefile.am | 5 | ||||
| -rw-r--r-- | test/Makefile.in | 23 |
3 files changed, 22 insertions, 13 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 8f4caa0c..a5df1760 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2013-04-19 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (LOCALES): New variable split out from AWK. + (AWK): Adjust. + (next): Add LOCALES to the test so that it will pass everywhere. + Thanks to Juergen Kahrs for the report. + 2013-04-16 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am: Prettify the lists of tests. diff --git a/test/Makefile.am b/test/Makefile.am index d7988fa3..75e0c6ef 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1024,7 +1024,8 @@ VALGRIND = # # And we set AWKLIBPATH to find the extension libraries we built. -AWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} AWKLIBPATH=../extension/.libs $(VALGRIND) $(AWKPROG) +LOCALES = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} +AWK = $(LOCALES) AWKLIBPATH=../extension/.libs $(VALGRIND) $(AWKPROG) # Message stuff is to make it a little easier to follow. # Make the pass-fail last and dependent on others to avoid @@ -1615,7 +1616,7 @@ posix2008sub: next: @echo $@ - @-AWK="$(AWKPROG)" $(srcdir)/$@.sh > _$@ 2>&1 + @-$(LOCALES) AWK="$(AWKPROG)" $(srcdir)/$@.sh > _$@ 2>&1 @-LC_ALL=C $(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ exit: diff --git a/test/Makefile.in b/test/Makefile.in index 75139f78..71b263b1 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -121,16 +121,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ - -# This business forces the locale to be C for running the tests, -# unless we override it to something else for testing. -# -# This can also be done in individual tests where we wish to -# check things specifically not in the C locale. - -# -# And we set AWKLIBPATH to find the extension libraries we built. -AWK = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} AWKLIBPATH=../extension/.libs $(VALGRIND) $(AWKPROG) +AWK = $(LOCALES) AWKLIBPATH=../extension/.libs $(VALGRIND) $(AWKPROG) CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -1241,6 +1232,16 @@ AWKPROG = ../gawk$(EXEEXT) # Default for VALGRIND is empty unless overridden by a command-line argument. # This protects against cruft in the environment. VALGRIND = + +# This business forces the locale to be C for running the tests, +# unless we override it to something else for testing. +# +# This can also be done in individual tests where we wish to +# check things specifically not in the C locale. + +# +# And we set AWKLIBPATH to find the extension libraries we built. +LOCALES = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} all: all-am .SUFFIXES: @@ -2010,7 +2011,7 @@ posix2008sub: next: @echo $@ - @-AWK="$(AWKPROG)" $(srcdir)/$@.sh > _$@ 2>&1 + @-$(LOCALES) AWK="$(AWKPROG)" $(srcdir)/$@.sh > _$@ 2>&1 @-LC_ALL=C $(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ exit: |