[gawk-diffs] [SCM] gawk branch, porting, updated. 48e8090a8d94726d3d57fdf6b79930acbab0a73b

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, porting has been updated
       via  48e8090a8d94726d3d57fdf6b79930acbab0a73b (commit)
      from  fc9ff1b7115e5b44b34f0694e099d51b75b2aac3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=48e8090a8d94726d3d57fdf6b79930acbab0a73b

commit 48e8090a8d94726d3d57fdf6b79930acbab0a73b
Author: Arnold D. Robbins <address@hidden>
Date:   Fri Apr 19 11:25:25 2013 +0300

    Fix 'next' test to be locale-independent.

diff --git a/test/ChangeLog b/test/ChangeLog
index 8f4caa0..a5df176 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-19         Arnold D. Robbins     <address@hidden>
+
+       * 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     <address@hidden>
 
        * Makefile.am: Prettify the lists of tests.
diff --git a/test/Makefile.am b/test/Makefile.am
index d7988fa..75e0c6e 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)/address@hidden > _$@ 2>&1
+       @-$(LOCALES) AWK="$(AWKPROG)" $(srcdir)/address@hidden > _$@ 2>&1
        @-LC_ALL=C $(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 exit:
diff --git a/test/Makefile.in b/test/Makefile.in
index 75139f7..71b263b 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)/address@hidden > _$@ 2>&1
+       @-$(LOCALES) AWK="$(AWKPROG)" $(srcdir)/address@hidden > _$@ 2>&1
        @-LC_ALL=C $(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 exit:

-----------------------------------------------------------------------

Summary of changes:
 test/ChangeLog   |    7 +++++++
 test/Makefile.am |    5 +++--
 test/Makefile.in |   23 ++++++++++++-----------
 3 files changed, 22 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
gawk