diff options
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Makefile.in | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 50258486..c5c0f7ee 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2018-02-01 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (AWK): Move LANGUAGE= to here instead of + having it in individual tests. + 2018-01-24 John E. Malmberg <wb8tyw@qsl.net> * lintold.awk: Minor change to allow test to run on diff --git a/test/Makefile.am b/test/Makefile.am index 1ef52600..b0b2baa1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1355,7 +1355,7 @@ VALGRIND = # # And we set AWKLIBPATH to find the extension libraries we built. -LOCALES = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} +LOCALES = LANGUAGE= 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. @@ -2466,7 +2466,7 @@ nonfatal1: nlstringtest:: @echo $@ - @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 LANGUAGE= ; \ + @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ diff --git a/test/Makefile.in b/test/Makefile.in index aa0d7655..1a64147e 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1610,7 +1610,7 @@ VALGRIND = # # And we set AWKLIBPATH to find the extension libraries we built. -LOCALES = LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} +LOCALES = LANGUAGE= LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} all: all-am .SUFFIXES: @@ -2902,7 +2902,7 @@ nonfatal1: nlstringtest:: @echo $@ - @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 LANGUAGE= ; \ + @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ Gt-dummy: |