gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gawk-diffs] [SCM] gawk branch, feature/improve-tests, updated. gawk-4.1


From: Arnold Robbins
Subject: [gawk-diffs] [SCM] gawk branch, feature/improve-tests, updated. gawk-4.1.0-3063-g92e59d5
Date: Wed, 11 Apr 2018 03:32:11 -0400 (EDT)

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, feature/improve-tests has been updated
       via  92e59d54ea0e9da4de1c55004ea147eb6ef5d2d9 (commit)
      from  1272a45394f2bd0ff753ea7e489e0137c6ff409a (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=92e59d54ea0e9da4de1c55004ea147eb6ef5d2d9

commit 92e59d54ea0e9da4de1c55004ea147eb6ef5d2d9
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Apr 11 10:30:03 2018 +0300

    Add automation for tests needing locales.

diff --git a/test/ChangeLog b/test/ChangeLog
index 8e78c2c..fd40c8f 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-11         Arnold D. Robbins     <address@hidden>
+
+       * Gentests: Add support for tests that need a specific locale.
+       * Makefile.am (NEED_LOCALE_C, NEED_LOCALE_EN, NEED_LOCALE_JP,
+       NEED_LOCALE_RU): New lists of such tests.
+
 2018-04-09         Arnold D. Robbins     <address@hidden>
 
        * Makefile.am (RUN_SHELL): List of tests that run a .sh file.
diff --git a/test/Gentests b/test/Gentests
index 84bddf2..bc9b726 100755
--- a/test/Gentests
+++ b/test/Gentests
@@ -13,6 +13,13 @@ BEGIN {
        ARGC = 2
 
        ntests = 0
+
+       Locale["C"] = "C"
+       Locale["EN"] = "en_US.UTF-8"
+       Locale["FR"] = "fr_FR.UTF-8"
+       Locale["GR"] = "el_GR.iso88597"
+       Locale["JA"] = "ja_JP.UTF-8"
+       Locale["RU"] = "ru_RU.UTF-8"
 }
 
 # process the file Makefile.am:
@@ -98,6 +105,18 @@ BEGIN {
        next
 }
 
+# Tests needing a particular locale
+/^NEED_LOCALE_.* *=/,/[^\\]$/ {
+       if (/^NEED/)
+               cur_locale = gensub(/^NEED_LOCALE_([[:alnum:]]+).*/, "\\1", 1, 
$1)
+
+       gsub(/^NEED_LOCALE_.* *=|\\$/, "")
+       for (i = 1; i <= NF; i++) {
+               locale_tests[cur_locale][$i]
+               all_locale_tests[$i]
+       }
+}
+
 /^[[:alpha:]_][[:alnum:]_]*:/ {
        # remember all targets from Makefile.am
        sub(/:.*/,"")
@@ -137,7 +156,7 @@ function generate_shell(x,  s)
        
 }
 
-function generate(x,   s)
+function generate(x,   s, i, locale_string)
 {
        if (x".sh" in files)
                return generate_shell(x)
@@ -191,14 +210,29 @@ function generate(x,      s)
 
        printf "address@hidden address@hidden"
 
+       # default is the leading tab and @
+       locale_string = "\t@"
+       if (x in all_locale_tests) {
+               delete all_locale_tests[x]
+               for (i in locale_tests) {
+                       if (x in locale_tests[i]) {
+                               locale_string = sprintf("address@hidden -z 
\"$$GAWKLOCALE\" ] && GAWKLOCALE=%s; export GAWKLOCALE; \\\n\t", Locale[i])
+                               delete locale_tests[i][x]
+                               break
+                       }
+               }
+       }
+
        if (x in mpfr) {
                delete mpfr[x]
-               printf "address@hidden"$(srcdir)\" $(AWK) $(AWKFLAGS) -f 
address@hidden %s >_$@ 2>&1 || echo EXIT CODE: $$? >>address@hidden", s
+               printf "%s", locale_string
+               printf "AWKPATH=\"$(srcdir)\" $(AWK) $(AWKFLAGS) -f 
address@hidden %s >_$@ 2>&1 || echo EXIT CODE: $$? >>address@hidden", s
                printf "address@hidden test -z \"$$AWKFLAGS\" ; then $(CMP) 
\"$(srcdir)\"/address@hidden _$@ && rm -f _$@ ; else \\\n"
                printf "\t$(CMP) \"$(srcdir)\"/address@hidden _$@ && rm -f _$@ 
; \\\n"
                printf "\tfi\n\n"
        } else {
-               printf "address@hidden"$(srcdir)\" $(AWK) -f address@hidden %s 
>_$@ 2>&1 || echo EXIT CODE: $$? >>address@hidden", s
+               printf "%s", locale_string
+               printf "AWKPATH=\"$(srcdir)\" $(AWK) -f address@hidden %s >_$@ 
2>&1 || echo EXIT CODE: $$? >>address@hidden", s
                printf "address@hidden(CMP) \"$(srcdir)\"/address@hidden _$@ && 
rm -f address@hidden"
        }
 }
@@ -229,6 +263,11 @@ END {
                if (!(x in targets))
                        printf "WARNING: --non-decimal-data target `%s' is 
missing.\n", x > "/dev/stderr"
 
+       for (x in locale_tests)
+               for (y in locale_tests[x])
+                       if (!(y in targets))
+                               printf("WARNING: Locale `%s' target `%s' is 
missing.\n", x, y) > "/dev/stderr"
+
        for (x in files)
                if (!(x in unused) && \
                    !(gensub(/\.(awk|in|sh)$/,"",1,x) in targets))
diff --git a/test/Makefile.am b/test/Makefile.am
index cf71761..bc03363 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1365,6 +1365,24 @@ FAIL_CODE1 = \
 CHECK_MPFR = \
        rand fnarydel fnparydl
 
+# Lists of tests that need particular locales
+NEED_LOCALE_C = \
+       clos1way gsubtst6
+
+NEED_LOCALE_EN = \
+       backbigs1 backsmalls1 backsmalls2 concat4 dfamb1 ignrcas2 lc_num1 \
+       mbfw1 mbprintf1 mbprintf3 mbprintf4 mbstr1 mbstr2 printhuge rri1 \
+       subamp subi18n wideidx wideidx2 widesub widesub2 widesub3 widesub4
+
+# Unused at the moment, since nlstringtest has additional stufff it does
+# NEED_LOCALE_FR =
+# Same for ignrcas3
+# NEED_LOCALE_GR =
+
+NEED_LOCALE_JP = mbprintf2
+
+NEED_LOCALE_RU = mtchi18n
+
 # List of the files that appear in manual tests or are for reserve testing:
 GENTESTS_UNUSED = Makefile.in checknegtime.awk dtdgport.awk gtlnbufv.awk \
        hello.awk inchello.awk inclib.awk inplace.1.in inplace.2.in \
@@ -1512,13 +1530,6 @@ mpfr-msg-end:
        @echo "======== Done with MPFR tests ========"
 
 
-lc_num1:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-
 # This test is a PITA because increasingly, /tmp is getting
 # mounted noexec.  So, we'll test it locally.  Sigh.
 #
@@ -1598,7 +1609,7 @@ badargs::
 
 strftime::
        @echo $@
-       @GAWKLOCALE=C; export GAWKLOCALE; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=C ; export GAWKLOCALE; \
        TZ=GMT0; export TZ; \
        $(AWK) -v OUTPUT=_$@ -f "$(srcdir)"/strftime.awk
        @-$(CMP) strftime.ok _$@ && rm -f _$@ strftime.ok || exit 0
@@ -1753,54 +1764,6 @@ rsnulbig2::
                $(AWK) '/^[^a]/; END { print NR }' >_$@ 2>&1 || echo EXIT CODE: 
$$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-wideidx::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-wideidx2::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-widesub::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-widesub2::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-widesub3::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-widesub4::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-ignrcas2::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? 
>> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-subamp::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 # This test makes sure gawk exits with a zero code.
 # Thus, unconditionally generate the exit code.
 exitval1::
@@ -1818,9 +1781,11 @@ rsstart3::
        @head "$(srcdir)"/rsstart1.in | $(AWK) -f "$(srcdir)"/rsstart2.awk >_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+# FIXME: Gentests can't really deal with something that is both a shell script
+# and requires a locale. We might can fix that ...
 rtlenmb::
        @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE ; \
        "$(srcdir)"/rtlen.sh >_$@ || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -1834,16 +1799,6 @@ binmode1::
        @$(AWK) -v BINMODE=3 'BEGIN { print BINMODE }' >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-subi18n::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; $(AWK) -f "$(srcdir)"/address@hidden > _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-concat4::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; $(AWK) -f "$(srcdir)"/address@hidden 
"$(srcdir)"/address@hidden > _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 devfd1::
        @echo $@
        @$(AWK) -f "$(srcdir)"/address@hidden 4< "$(srcdir)"/devfd.in1 5< 
"$(srcdir)"/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1860,75 +1815,22 @@ mixed1::
        @$(AWK) -f /dev/null --source 'BEGIN {return junk}' >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-mtchi18n::
-       @echo $@
-       @GAWKLOCALE=ru_RU.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 reint2::
        @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE ; \
        AWKPATH="$(srcdir)" $(AWK) --re-interval -f address@hidden 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-mbprintf1::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbprintf2::
-       @echo $@
-       @GAWKLOCALE=ja_JP.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? 
>> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbprintf3::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbprintf4::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 mbprintf5::
        @echo $@
        @case `uname` in \
        CYGWIN*) echo this test fails on cygwin --- skipping $@ ;; \
        *) \
-       GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
+       [ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE ; \
        $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@ ; \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        esac
 
-mbfw1::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-gsubtst6::
-       @echo $@
-       @GAWKLOCALE=C ; $(AWK) -f "$(srcdir)"/address@hidden > _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbstr1::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbstr2::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 printfbad2: printfbad2.ok
        @echo $@
        @$(AWK) --lint -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden 
2>&1 | sed 's;$(srcdir)/;;g' >_$@ || echo EXIT CODE: $$?  >>_$@
@@ -1988,12 +1890,6 @@ profile7:
        @sed 1,2d < address@hidden > _$@; rm address@hidden
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-rri1::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 mpfrieee:
        @echo $@
        @$(AWK) -M -vPREC=double -f "$(srcdir)"/address@hidden > _$@ 2>&1
@@ -2162,7 +2058,7 @@ fts:
 
 charasbytes:
        @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
        AWKPATH="$(srcdir)" $(AWK) -b -f address@hidden 
"$(srcdir)"/address@hidden | \
        od -c -t x1 | tr '      ' ' ' | sed -e 's/  */ /g' -e 's/ *$$//' >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
@@ -2197,36 +2093,6 @@ colonwarn:
        done > _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-clos1way:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=C; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-dfamb1:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-backbigs1:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-backsmalls1:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-backsmalls2:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 dbugeval::
        @echo $@
        @if [ -t 0 ]; then \
@@ -2234,12 +2100,6 @@ dbugeval::
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        fi
 
-printhuge::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 filefuncs:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden -v 
builddir="$(abs_top_builddir)"  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2281,7 +2141,7 @@ pty2:
 ignrcas3::
        @echo $@
        @if locale -a | grep el_GR.iso88597 > /dev/null ; then \
-       GAWKLOCALE=el_GR.iso88597 \
+       [ -z "$$GAWKLOCALE" ] && GAWKLOCALE=el_GR.iso88597 ; export GAWKLOCALE; 
\
        AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@ ; \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        fi
@@ -2303,7 +2163,7 @@ nonfatal1:
 
 nlstringtest::
        @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; export GAWKLOCALE ; \
        AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)" >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
        @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ ; \
        then \
diff --git a/test/Makefile.in b/test/Makefile.in
index e7dcba5..c2151ec 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1624,6 +1624,23 @@ CHECK_MPFR = \
        rand fnarydel fnparydl
 
 
+# Lists of tests that need particular locales
+NEED_LOCALE_C = \
+       clos1way gsubtst6
+
+NEED_LOCALE_EN = \
+       backbigs1 backsmalls1 backsmalls2 concat4 dfamb1 ignrcas2 lc_num1 \
+       mbfw1 mbprintf1 mbprintf3 mbprintf4 mbstr1 mbstr2 printhuge rri1 \
+       subamp subi18n wideidx wideidx2 widesub widesub2 widesub3 widesub4
+
+
+# Unused at the moment, since nlstringtest has additional stufff it does
+# NEED_LOCALE_FR =
+# Same for ignrcas3
+# NEED_LOCALE_GR =
+NEED_LOCALE_JP = mbprintf2
+NEED_LOCALE_RU = mtchi18n
+
 # List of the files that appear in manual tests or are for reserve testing:
 GENTESTS_UNUSED = Makefile.in checknegtime.awk dtdgport.awk gtlnbufv.awk \
        hello.awk inchello.awk inclib.awk inplace.1.in inplace.2.in \
@@ -1955,12 +1972,6 @@ mpfr-msg-start:
 mpfr-msg-end:
        @echo "======== Done with MPFR tests ========"
 
-lc_num1:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 # This test is a PITA because increasingly, /tmp is getting
 # mounted noexec.  So, we'll test it locally.  Sigh.
 #
@@ -2040,7 +2051,7 @@ badargs::
 
 strftime::
        @echo $@
-       @GAWKLOCALE=C; export GAWKLOCALE; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=C ; export GAWKLOCALE; \
        TZ=GMT0; export TZ; \
        $(AWK) -v OUTPUT=_$@ -f "$(srcdir)"/strftime.awk
        @-$(CMP) strftime.ok _$@ && rm -f _$@ strftime.ok || exit 0
@@ -2195,54 +2206,6 @@ rsnulbig2::
                $(AWK) '/^[^a]/; END { print NR }' >_$@ 2>&1 || echo EXIT CODE: 
$$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-wideidx::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-wideidx2::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-widesub::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-widesub2::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-widesub3::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-widesub4::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-ignrcas2::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? 
>> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-subamp::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 # This test makes sure gawk exits with a zero code.
 # Thus, unconditionally generate the exit code.
 exitval1::
@@ -2260,9 +2223,11 @@ rsstart3::
        @head "$(srcdir)"/rsstart1.in | $(AWK) -f "$(srcdir)"/rsstart2.awk >_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+# FIXME: Gentests can't really deal with something that is both a shell script
+# and requires a locale. We might can fix that ...
 rtlenmb::
        @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE ; \
        "$(srcdir)"/rtlen.sh >_$@ || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -2276,16 +2241,6 @@ binmode1::
        @$(AWK) -v BINMODE=3 'BEGIN { print BINMODE }' >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-subi18n::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; $(AWK) -f "$(srcdir)"/address@hidden > _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-concat4::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; $(AWK) -f "$(srcdir)"/address@hidden 
"$(srcdir)"/address@hidden > _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 devfd1::
        @echo $@
        @$(AWK) -f "$(srcdir)"/address@hidden 4< "$(srcdir)"/devfd.in1 5< 
"$(srcdir)"/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2302,75 +2257,22 @@ mixed1::
        @$(AWK) -f /dev/null --source 'BEGIN {return junk}' >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-mtchi18n::
-       @echo $@
-       @GAWKLOCALE=ru_RU.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 reint2::
        @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE ; \
        AWKPATH="$(srcdir)" $(AWK) --re-interval -f address@hidden 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-mbprintf1::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbprintf2::
-       @echo $@
-       @GAWKLOCALE=ja_JP.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? 
>> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbprintf3::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbprintf4::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 mbprintf5::
        @echo $@
        @case `uname` in \
        CYGWIN*) echo this test fails on cygwin --- skipping $@ ;; \
        *) \
-       GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
+       [ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE ; \
        $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@ ; \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        esac
 
-mbfw1::
-       @echo $@
-       @GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-gsubtst6::
-       @echo $@
-       @GAWKLOCALE=C ; $(AWK) -f "$(srcdir)"/address@hidden > _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbstr1::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbstr2::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 printfbad2: printfbad2.ok
        @echo $@
        @$(AWK) --lint -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden 
2>&1 | sed 's;$(srcdir)/;;g' >_$@ || echo EXIT CODE: $$?  >>_$@
@@ -2430,12 +2332,6 @@ profile7:
        @sed 1,2d < address@hidden > _$@; rm address@hidden
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-rri1::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 mpfrieee:
        @echo $@
        @$(AWK) -M -vPREC=double -f "$(srcdir)"/address@hidden > _$@ 2>&1
@@ -2604,7 +2500,7 @@ fts:
 
 charasbytes:
        @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
        AWKPATH="$(srcdir)" $(AWK) -b -f address@hidden 
"$(srcdir)"/address@hidden | \
        od -c -t x1 | tr '      ' ' ' | sed -e 's/  */ /g' -e 's/ *$$//' >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
@@ -2639,36 +2535,6 @@ colonwarn:
        done > _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-clos1way:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=C; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-dfamb1:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-backbigs1:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-backsmalls1:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-backsmalls2:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 dbugeval::
        @echo $@
        @if [ -t 0 ]; then \
@@ -2676,12 +2542,6 @@ dbugeval::
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        fi
 
-printhuge::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 filefuncs:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden -v 
builddir="$(abs_top_builddir)"  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2721,7 +2581,7 @@ pty2:
 ignrcas3::
        @echo $@
        @if locale -a | grep el_GR.iso88597 > /dev/null ; then \
-       GAWKLOCALE=el_GR.iso88597 \
+       [ -z "$$GAWKLOCALE" ] && GAWKLOCALE=el_GR.iso88597 ; export GAWKLOCALE; 
\
        AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@ ; \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        fi
@@ -2743,7 +2603,7 @@ nonfatal1:
 
 nlstringtest::
        @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; export GAWKLOCALE ; \
        AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)" >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
        @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ ; \
        then \
@@ -2953,6 +2813,12 @@ concat3:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+concat4:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 concat5:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -2993,6 +2859,12 @@ delfunc:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+dfamb1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 dfastress:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -3183,6 +3055,12 @@ gsubtst5:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+gsubtst6:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=C; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 gsubtst7:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3630,6 +3508,12 @@ resplit:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+rri1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 rs:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3765,11 +3649,23 @@ strtod:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+subamp:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 subback:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+subi18n:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 subsepnm:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -3850,6 +3746,42 @@ uplus:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+wideidx:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+wideidx2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+widesub:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+widesub2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+widesub3:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+widesub4:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 wjposer1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3930,6 +3862,12 @@ backw:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+clos1way:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=C; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 clos1way2:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -4160,6 +4098,12 @@ igncfs:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+ignrcas2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 ignrcas4:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -4260,6 +4204,18 @@ match3:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+mbstr1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbstr2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 muldimposix:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --posix >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
@@ -4320,6 +4276,12 @@ printfbad4:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+printhuge:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 procinfs:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -4545,6 +4507,24 @@ asorti:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+backbigs1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+backsmalls1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+backsmalls2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 fmttest:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -4564,6 +4544,48 @@ fnparydl:
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        fi
 
+lc_num1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbfw1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbprintf1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbprintf2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbprintf3:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbprintf4:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mtchi18n:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ru_RU.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 rebt8b2:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 905bd28..879858f 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -200,6 +200,12 @@ concat3:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+concat4:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 concat5:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -240,6 +246,12 @@ delfunc:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+dfamb1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 dfastress:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -430,6 +442,12 @@ gsubtst5:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+gsubtst6:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=C; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 gsubtst7:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -877,6 +895,12 @@ resplit:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+rri1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 rs:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1012,11 +1036,23 @@ strtod:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+subamp:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 subback:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+subi18n:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 subsepnm:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -1097,6 +1133,42 @@ uplus:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+wideidx:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+wideidx2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+widesub:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+widesub2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+widesub3:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+widesub4:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 wjposer1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1177,6 +1249,12 @@ backw:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+clos1way:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=C; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 clos1way2:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1407,6 +1485,12 @@ igncfs:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+ignrcas2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 ignrcas4:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -1507,6 +1591,18 @@ match3:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+mbstr1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbstr2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 muldimposix:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --posix >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
@@ -1567,6 +1663,12 @@ printfbad4:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+printhuge:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 procinfs:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -1792,6 +1894,24 @@ asorti:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+backbigs1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+backsmalls1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+backsmalls2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 fmttest:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -1811,6 +1931,48 @@ fnparydl:
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        fi
 
+lc_num1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbfw1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbprintf1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbprintf2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbprintf3:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbprintf4:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mtchi18n:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ru_RU.UTF-8; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 rebt8b2:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@

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

Summary of changes:
 test/ChangeLog   |   6 +
 test/Gentests    |  45 ++++++-
 test/Makefile.am | 194 +++++-------------------------
 test/Makefile.in | 354 +++++++++++++++++++++++++++++--------------------------
 test/Maketests   | 162 +++++++++++++++++++++++++
 5 files changed, 425 insertions(+), 336 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]