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-3107-gb39340b
Date: Thu, 3 May 2018 18:48:50 -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  b39340b3f8a553a4836aa27e14b4918586806556 (commit)
      from  209b126b2df746ee9809fe89139e650f7f1c6836 (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=b39340b3f8a553a4836aa27e14b4918586806556

commit b39340b3f8a553a4836aa27e14b4918586806556
Author: Arnold D. Robbins <address@hidden>
Date:   Thu May 3 18:48:23 2018 -0400

    Add generation of pc/Makefile.tst to dist hook and main Makefile.am.

diff --git a/ChangeLog b/ChangeLog
index cb00f34..6824921 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-03         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (pc/Makefile.tst): New target.
+       (dist-hook): Now depends upon pc/Makefile.tst.
+
 2018-04-30         Arnold D. Robbins     <address@hidden>
 
        * gawkapi.h [dl_load_func]: Minor improvement in version mismatch
diff --git a/Makefile.am b/Makefile.am
index 0089b86..b936294 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -169,7 +169,7 @@ check-local: gawk$(EXEEXT)
 
 # A little extra clean up when making distributions.
 # And additional set up for the pc directory.
-dist-hook:
+dist-hook: pc/Makefile.tst
        cd "$(distdir)"/extension ; rm -f *.o *.so
        cd "$(srcdir)"/pc ; \
        chmod u+w config.h ; \
@@ -191,6 +191,9 @@ command.c: command.y
        $(YACC) -o $@ -p zz $<
        sed 's/parse error/syntax error/g' < $@ > address@hidden && mv 
address@hidden $@
 
+pc/Makefile.tst: test/Makefile.in
+       cd pc && awk -f GenMakefileTst.awk ../test/Makefile.in > Makefile.tst
+
 # This is for my development & testing.
 efence: gawk
        $(CC) $(LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LDADD) $(LIBS) 
-lefence
diff --git a/Makefile.in b/Makefile.in
index ade9835..67c6af0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1179,7 +1179,7 @@ check-local: gawk$(EXEEXT)
 
 # A little extra clean up when making distributions.
 # And additional set up for the pc directory.
-dist-hook:
+dist-hook: pc/Makefile.tst
        cd "$(distdir)"/extension ; rm -f *.o *.so
        cd "$(srcdir)"/pc ; \
        chmod u+w config.h ; \
@@ -1201,6 +1201,9 @@ command.c: command.y
        $(YACC) -o $@ -p zz $<
        sed 's/parse error/syntax error/g' < $@ > address@hidden && mv 
address@hidden $@
 
+pc/Makefile.tst: test/Makefile.in
+       cd pc && awk -f GenMakefileTst.awk ../test/Makefile.in > Makefile.tst
+
 # This is for my development & testing.
 efence: gawk
        $(CC) $(LDFLAGS) -o gawk $$(ls *.o | grep -v '_p.o$$') $(LDADD) $(LIBS) 
-lefence
diff --git a/pc/ChangeLog b/pc/ChangeLog
index f4e99d1..59e8d81 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,11 @@
+2018-05-03         Arnold D. Robbins     <address@hidden>
+
+       * GenMakefileTst.awk: Use only fully portable constructs so that
+       it can be run by any awk.
+       * Makefile.tst.original: Renamed from Makefile.tst. To be kept
+       around until merge with master.
+       * Makefile.tst: Now autogenerated.
+
 2018-04-27  Eli Zaretskii  <address@hidden>
 
        * Makefile.tst.prologue (PGAWK, GAWK2): Delete unused variables.
diff --git a/pc/GenMakefileTst.awk b/pc/GenMakefileTst.awk
index a465ca7..baa69b8 100644
--- a/pc/GenMakefileTst.awk
+++ b/pc/GenMakefileTst.awk
@@ -149,7 +149,9 @@ function print_recipe(              i, start)
 function start_new_recipe()
 {
        # get the name of the target
-       name = gensub(/(^[[:alpha:]_][-[:alnum:]_])*:.*/, "\\1", 1, $0)
+       # use match(), not gensub(), so that this script is fully portable
+       match($0, /^[[:alpha:]_][-[:alnum:]_]*:/)
+       name = substr($0, RSTART, RLENGTH - 1)  # leave out the colon
 
        delete recipe_lines
        line = 0
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index ade146f..fc16f64 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -61,9 +61,6 @@ SHELL = /bin/sh
 
 # Point to gawk
 AWK = AWKLIBPATH=../extension $(AWKPROG)
-# Also point to gawk but for DOS commands needing backslashes.  We need
-# the forward slash version too or 'arrayparam' fails.
-AWK2 = '..\gawk.exe'
 AWKPROG = ../gawk.exe
 # Point $(LS) to a version of ls.exe that reports true Windows file
 # index numbers, because this is what the readdir test expects.
@@ -71,9 +68,6 @@ AWKPROG = ../gawk.exe
 # report full index values.)
 LS = ls.exe
 
-# Define PGAWK
-PGAWK = ../gawk.exe -p
-
 # Set your cmp command here (you can use most versions of diff instead of cmp
 # if you don't want to convert the .ok files to the DOS CR/LF format).
 # This is also an issue for the "mmap8k" test.  If it fails, make sure that
@@ -117,6 +111,9 @@ MKDIR = mkdir
 #DATE = date
 DATE = gdate
 
+# Set sort command
+SORT = sort
+
 # MS-DOS and OS/2 use ; as a PATH delimiter
 PATH_SEPARATOR = ;
 
@@ -162,7 +159,7 @@ BASIC_TESTS = \
        hex hex2 hsprint \
        inpref inputred intest intprec iobug1 \
        leaddig leadnl litoct longsub longwrds \
-       manglprm math membug1 memleak messages minusstr mmap8k mtchi18n \
+       manglprm math membug1 memleak messages minusstr mmap8k \
        nasty nasty2 negexp negrange nested nfldstr nfloop nfneg nfset nlfldsep 
\
        nlinstr nlstrina noeffect nofile nofmtch noloop1 noloop2 nonl noparms \
        nors nulinsrc nulrsend numindex numstr1 numsubstr \
@@ -179,7 +176,7 @@ BASIC_TESTS = \
        sigpipe1 sortempty sortglos splitargv splitarr \
        splitdef splitvar splitwht status-close strcat1 strnum1 strnum2 strtod \
        subamp subback subi18n subsepnm subslash substr swaplns synerr1 synerr2 
\
-       tradanch tweakfld \
+       tailrecurse tradanch tweakfld \
        uninit2 uninit3 uninit4 uninit5 uninitialized unterm uparrfs uplus \
        wideidx wideidx2 widesub widesub2 widesub3 widesub4 wjposer1 \
        zero2 zeroe0 zeroflag
@@ -222,14 +219,11 @@ ARRAYDEBUG_TESTS = arrdbg
 EXTRA_TESTS = inftest regtest ignrcas3 
 INET_TESTS = inetdayu inetdayt inetechu inetecht
 MACHINE_TESTS = double1 double2 fmtspcl intformat
-MPFR_TESTS = mpfrbigint mpfrexprange mpfrieee mpfrmemok1 mpfrnegzero \
-       mpfrnr mpfrrem mpfrrnd mpfrrndeval mpfrsort mpfrsqrt \
-       mpfrstrtonum mpgforcenum mpfruplus
 LOCALE_CHARSET_TESTS = \
        asort asorti backbigs1 backsmalls1 backsmalls2 \
        fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \
        mbprintf1 mbprintf2 mbprintf3 mbprintf4 mbprintf5 \
-       nlstringtest rebt8b2 rtlenmb sort1 sprintfc
+       mtchi18n nlstringtest rebt8b2 rtlenmb sort1 sprintfc
 
 SHLIB_TESTS = \
        apiterm \
@@ -237,20 +231,47 @@ SHLIB_TESTS = \
        getfile \
        inplace1 inplace2 inplace3 \
        ordchr ordchr2 \
-       readdir readdir_test readfile readfile2 revout \
+       readdir readdir_test readdir_retest readfile readfile2 revout \
        revtwoway rwarray \
        testext time
 
 
+# List of the tests which should be run with --debug option:
+NEED_DEBUG = dbugtypedre1 dbugtypedre2 dbugeval2 symtab10
+
 # List of the tests which should be run with --lint option:
 NEED_LINT = \
        defref fmtspcl lintexp lintindex lintint lintlength lintwarn \
-       noeffect nofmtch shadow uninit2 uninit3 uninit4 uninit5 uninitialized
+       noeffect nofmtch nonl shadow uninit2 uninit3 uninit4 uninit5 
uninitialized
 
 
 # List of the tests which should be run with --lint-old option:
 NEED_LINT_OLD = lintold
 
+# List of tests that must be run with -M
+NEED_MPFR = mpfrbigint mpfrexprange mpfrfield mpfrieee mpfrmemok1 \
+       mpfrnegzero mpfrnr mpfrrem mpfrrnd mpfrrndeval mpfrsort mpfrsqrt \
+       mpfrstrtonum mpgforcenum mpfruplus
+
+
+# List of tests that need --non-decimal-data
+NEED_NONDEC = nondec2 intarray forcenum
+
+# List of tests that need --posix
+NEED_POSIX = printf0 posix2008sub paramasfunc1 paramasfunc2 muldimposix
+
+# List of tests that need --pretty-print
+NEED_PRETTY = profile4 profile5 profile8 profile9 profile10
+
+# List of tests that need --re-interval
+NEED_RE_INTERVAL = gsubtst3 reint reint2
+
+# List of tests that need --traditional
+NEED_TRADITIONAL = litoct tradanch rscompat
+
+# Lists of tests that run a shell script
+RUN_SHELL = exit fflush localenl next randtest rtlen rtlen01
+
 # List of the tests which fail with EXIT CODE 1
 FAIL_CODE1 = \
        badassign1 badbuild callparam delfunc fcall_exit fcall_exit2 \
@@ -264,10 +285,53 @@ 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 reint2 \
+       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 tests that fail on DJGPP
+EXPECTED_FAIL_DJGPP = \
+       backbigs1 backsmalls1 backw beginfile1 clos1way clos1way2 \
+       clos1way3 clos1way4 clos1way5 clos1way6 errno getlndir \
+       getlnhd gnuops3 gnureops id ignrcas3 inetdayt inetdayu \
+       inetecht inetechu inftest jarebug mbfw1 mbprintf1 mbprintf4 \
+       mbstr1 mbstr2 mpfrsqrt nonfatal1 nonfatal2 nonfatal3 pid pty1 pty2 \
+       regx8bit strtod sigpipe1 timeout
+
+
+# List of tests that fail on MinGW
+EXPECTED_FAIL_MINGW = \
+       backbigs1 backsmalls1 clos1way6 devfd devfd1 devfd2 \
+       errno exitval2 fork fork2 fts getfile getlnhd ignrcas3 inetdayt \
+       inetecht mbfw1 mbprintf1 mbprintf4 mbstr1 mbstr2 pid pipeio2 \
+       pty1 pty2 readdir readdir_test readdir_retest rstest4 rstest5 \
+       status-close timeout
+
+
 # List of the files that appear in manual tests or are for reserve testing:
-GENTESTS_UNUSED = Makefile.in dtdgport.awk gtlnbufv.awk hello.awk \
-       inchello.awk inclib.awk inplace.1.in inplace.2.in inplace.in \
-       longdbl.awk longdbl.in printfloat.awk readdir0.awk xref.awk
+GENTESTS_UNUSED = Makefile.in checknegtime.awk dtdgport.awk gtlnbufv.awk \
+       hello.awk inchello.awk inclib.awk inplace.1.in inplace.2.in \
+       inplace.in printfloat.awk readdir0.awk valgrind.awk xref.awk
+
+
+# List of tests on MinGW or DJGPP that need a different cmp program
+NEED_TESTOUTCMP = \
+       beginfile2 double2 exit fmttest hsprint posix profile5 space
+
+
 
 # Message stuff is to make it a little easier to follow.
 # Make the pass-fail last and dependent on others to avoid
@@ -280,8 +344,8 @@ check:      msg \
        machine-msg-start machine-tests machine-msg-end \
        charset-tests-all \
        shlib-msg-start  shlib-tests     shlib-msg-end \
-       mpfr-msg-start   mpfr-tests      mpfr-msg-end \
-       pass-fail
+       mpfr-msg-start   mpfr-tests      mpfr-msg-end
+       @-$(MAKE) pass-fail || { $(MAKE) diffout; exit 1; }
 
 basic: $(BASIC_TESTS)
 
@@ -290,7 +354,21 @@ unix-tests: $(UNIX_TESTS)
 gawk-extensions: $(GAWK_EXT_TESTS)
 
 charset-tests-all:
-       $(MAKE) charset-msg-start charset-tests charset-msg-end
+       @-case `uname` in \
+       *MINGW* | *MS-DOS*) \
+               $(MAKE) charset-msg-start charset-tests charset-msg-end ;; \
+       *) \
+               if locale -a | grep -i 'en_US.UTF.*8' > /dev/null && \
+                  locale -a | grep -i 'fr_FR.UTF.*8' > /dev/null && \
+                  locale -a | grep -i 'ru_RU.UTF.*8' > /dev/null && \
+                  locale -a | grep -i 'ja_JP.UTF.*8' > /dev/null  ; \
+               then \
+                       $(MAKE) charset-msg-start charset-tests 
charset-msg-end; \
+               else \
+                       echo %%%%%%%%%% Inadequate locale support: skipping 
charset tests. ; \
+                       echo %%%%%%%%%% At least ENU_USA.1252, FRA_FRA.1252, 
RUS_RUS.1251 and JPN_JPN.932 are needed. ; \
+               fi ;; \
+       esac
 
 charset-tests: $(LOCALE_CHARSET_TESTS)
 
@@ -305,16 +383,19 @@ machine-tests: $(MACHINE_TESTS)
 # to Windows format, butchering it in the process.  Likewise for /API/
 # in the next shlib-tests.
 mpfr-tests:
-       @if $(AWK) --version | $(AWK) ' /MPFR/ { exit 1 }' ; then \
+       @-if $(AWK) --version | $(AWK) ' /MPFR/ { exit 1 }' ; then \
        echo MPFR tests not supported on this system ; \
-       else $(MAKE) $(MPFR_TESTS) ; \
+       else $(MAKE) $(NEED_MPFR) ; \
        fi
 
 arraydebug-tests:
-       @echo gawk is not compiled to support the array debug tests
+       @-if echo $(CFLAGS) | grep ARRAYDEBUG > /dev/null ; then \
+       $(MAKE) $(ARRAYDEBUG_TESTS) ; \
+       else echo gawk is not compiled to support the array debug tests ; \
+       fi
 
 shlib-tests:
-       @if $(AWK) --version | $(AWK) ' /API/ { exit 1 }' ; then \
+       @-if $(AWK) --version | $(AWK) ' /API/ { exit 1 }' ; then \
        echo shlib tests not supported on this system ; \
        else $(MAKE) shlib-real-tests ; \
        fi
@@ -322,66 +403,63 @@ shlib-tests:
 shlib-real-tests: $(SHLIB_TESTS)
 
 msg::
-       @echo ""
-       @echo "Any output from $(CMP) is bad news, although some differences"
-       @echo "in floating point values are probably benign -- in particular,"
-       @echo "some systems may omit a leading zero and the floating point"
-       @echo "precision may lead to slightly different output in a few cases."
+       @echo ''
+       @echo 'Any output from "cmp" is bad news, although some differences'
+       @echo 'in floating point values are probably benign -- in particular,'
+       @echo 'some systems may omit a leading zero and the floating point'
+       @-echo 'precision may lead to slightly different output in a few cases.'
 
 printlang::
-       @$(AWK) -f "$(srcdir)"/printlang.awk
+       @-$(AWK) -f "$(srcdir)"/printlang.awk
 
 basic-msg-start:
-       @echo "======== Starting basic tests ========"
+       @-echo "======== Starting basic tests ========"
 
 basic-msg-end:
-       @echo "======== Done with basic tests ========"
+       @-echo "======== Done with basic tests ========"
 
 unix-msg-start:
-       @echo "======== Starting Unix tests ========"
+       @-echo "======== Starting Unix tests ========"
 
 unix-msg-end:
-       @echo "======== Done with Unix tests ========"
+       @-echo "======== Done with Unix tests ========"
 
 extend-msg-start:
-       @echo "======== Starting gawk extension tests ========"
+       @-echo "======== Starting gawk extension tests ========"
 
 extend-msg-end:
-       @echo "======== Done with gawk extension tests ========"
+       @-echo "======== Done with gawk extension tests ========"
 
 machine-msg-start:
-       @echo "======== Starting machine-specific tests ========"
+       @-echo "======== Starting machine-specific tests ========"
 
 machine-msg-end:
-       @echo "======== Done with machine-specific tests ========"
+       @-echo "======== Done with machine-specific tests ========"
 
 charset-msg-start:
        @echo "======== Starting tests that can vary based on character set or 
locale support ========"
        @echo 
"**************************************************************************"
        @echo "* Some or all of these tests may fail if you have inadequate or 
missing  *"
-       @echo "* locale support...                                              
        *"
-       @echo 
"**************************************************************************"
+       @echo "* locale support. At least ENU_USA.1252, FRA_FRA.1252, 
RUS_RUS.1251 and     *"
+       @echo "* JPN_JPN.932 are needed. The ell_GRC.1253 is optional but 
helpful.    *"
+       @echo "* However, if you see this message, the Makefile thinks you have 
what    *"
+       @echo "* you need ...                                                   
        *"
+       @-echo 
"**************************************************************************"
 
 charset-msg-end:
-       @echo "======== Done with tests that can vary based on character set or 
locale support ========"
+       @-echo "======== Done with tests that can vary based on character set 
or locale support ========"
 
 shlib-msg-start:
-       @echo "======== Starting shared library tests ========"
+       @-echo "======== Starting shared library tests ========"
 
 shlib-msg-end:
-       @echo "======== Done with shared library tests ========"
+       @-echo "======== Done with shared library tests ========"
 
 mpfr-msg-start:
-       @echo "======== Starting MPFR tests ========"
+       @-echo "======== Starting MPFR tests ========"
 
 mpfr-msg-end:
-       @echo "======== Done with MPFR tests ========"
-
-lc_num1:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+       @-echo "======== Done with MPFR tests ========"
 
 # This test is a PITA because increasingly, /tmp is getting
 # mounted noexec.  So, we'll test it locally.  Sigh.
@@ -403,122 +481,97 @@ poundbang::
 
 messages::
        @echo $@
-       @$(AWK) -f "$(srcdir)"/messages.awk >_out2 2>_out3
+       @$(AWK) -f "$(srcdir)"/messages.awk >_out2 2>_out3 || echo EXIT CODE: 
$$? >> _$@
        @-$(CMP) "$(srcdir)"/out1.ok _out1 && $(CMP) "$(srcdir)"/out2.ok _out2 
&& $(CMP) "$(srcdir)"/out3.ok _out3 && rm -f _out1 _out2 _out3
 
 argarray::
        @echo $@
        @cp "$(srcdir)"/argarray.in ./argarray.input
-       @TEST=test echo just a test | $(AWK) -f "$(srcdir)"/argarray.awk 
./argarray.input - >_$@
+       @TEST=test echo just a test | $(AWK) -f "$(srcdir)"/argarray.awk 
./argarray.input - >_$@ || echo EXIT CODE: $$? >> _$@
        @rm -f ./argarray.input
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 regtest::
+       @echo $@
        @echo 'Some of the output from regtest is very system specific, do not'
        @echo 'be distressed if your output differs from that distributed.'
        @echo 'Manual inspection is called for.'
-       AWK=$(AWKPROG) "$(srcdir)"/regtest.sh
+       @-AWK=$(AWKPROG) "$(srcdir)"/regtest.sh
 
 manyfiles::
-       @echo manyfiles
+       @echo $@
        @rm -rf junk
        @mkdir junk
        @$(AWK) 'BEGIN { for (i = 1; i <= 1030; i++) print i, i}' >_$@
-       @$(AWK) -f "$(srcdir)"/manyfiles.awk _$@ _$@
+       @$(AWK) -f "$(srcdir)"/manyfiles.awk _$@ _$@ || echo EXIT CODE: $$? >> 
_$@
        @wc -l junk/* | $(AWK) '$$1 != 2' | wc -l | sed "s/  *//g" > _$@
        @rm -rf junk
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 compare::
        @echo $@
-       @$(AWK) -f "$(srcdir)"/compare.awk 0 1 "$(srcdir)"/compare.in >_$@
+       @$(AWK) -f "$(srcdir)"/compare.awk 0 1 "$(srcdir)"/compare.in >_$@ || 
echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 inftest::
        @echo $@
+       @echo Expect $@ to fail with DJGPP.
        @echo This test is very machine specific...
-       @echo Expect inftest to fail with DJGPP.
-       @$(AWK) -f "$(srcdir)"/inftest.awk | sed "s/inf/Inf/g" >_$@
+       @$(AWK) -f "$(srcdir)"/inftest.awk | sed "s/inf/Inf/g" >_$@ || echo 
EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 getline2::
        @echo $@
-       @$(AWK) -f "$(srcdir)"/getline2.awk "$(srcdir)"/getline2.awk 
"$(srcdir)"/getline2.awk >_$@
+       @$(AWK) -f "$(srcdir)"/getline2.awk "$(srcdir)"/getline2.awk 
"$(srcdir)"/getline2.awk >_$@ || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 awkpath::
        @echo $@
-       @AWKPATH="$(srcdir)$(PATH_SEPARATOR)$(srcdir)/lib" $(AWK) -f 
awkpath.awk >_$@
+       @AWKPATH="$(srcdir)$(PATH_SEPARATOR)$(srcdir)/lib" $(AWK) -f 
awkpath.awk >_$@ || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 argtest::
        @echo $@
-       @$(AWK) -f "$(srcdir)"/argtest.awk -x -y abc >_$@
+       @$(AWK) -f "$(srcdir)"/argtest.awk -x -y abc >_$@ || echo EXIT CODE: 
$$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 badargs::
        @echo $@
-       @-$(AWK) -f 2>&1 | grep -v patchlevel >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-nonl::
-       @echo $@
-       @-AWKPATH="$(srcdir)" $(AWK) --lint -f nonl.awk /dev/null >_$@ 2>&1
+       @-$(AWK) -f 2>&1 | grep -v patchlevel >_$@ || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 strftime::
        @echo $@
-#      @GAWKLOCALE=C; export GAWKLOCALE; \
-#      TZ=GMT0; export TZ; \
-#      $(AWK) -v OUTPUT=_$@ -f "$(srcdir)"/strftime.awk
-       @GAWKLOCALE=C; export GAWKLOCALE; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=C ; export GAWKLOCALE; \
        TZ=GMT0; export TZ; \
-       $(AWK) -v OUTPUT=_$@ -v DATECMD="$(DATE)" -f "$(srcdir)"/strftime.awk
+       $(AWK) -v OUTPUT=_$@ -v DATECMD="$(DATE)" -f "$(srcdir)"/strftime.awk 
|| echo EXIT CODE: $$? >> _$@
        @-$(CMP) strftime.ok _$@ && rm -f _$@ strftime.ok || exit 0
 
-litoct::
-       @echo $@
-       @echo ab | $(AWK) --traditional -f "$(srcdir)"/litoct.awk >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 devfd::
        @echo $@
-       @echo Expect devfd to fail in MinGW
-       @$(AWK) 1 /dev/fd/4 /dev/fd/5 4<"$(srcdir)"/devfd.in4 
5<"$(srcdir)"/devfd.in5 >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
+       @echo Expect $@ to fail with MinGW.
+       @$(AWK) 1 /dev/fd/4 /dev/fd/5 4<"$(srcdir)"/devfd.in4 
5<"$(srcdir)"/devfd.in5 >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@ || echo EXIT 
CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+# This cannot be autogenerated; we want it to read the input name
+# on the command line.
 errno:
        @echo $@
-       @echo Expect errno to fail with DJGPP and MinGW due to error message 
differences
+       @echo Expect $@ to fail with DJGPP and MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-fflush::
-       @echo $@
-       @"$(srcdir)"/fflush.sh >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 tweakfld::
        @echo $@
-       @$(AWK) -f "$(srcdir)"/tweakfld.awk "$(srcdir)"/tweakfld.in >_$@
+       @$(AWK) -f "$(srcdir)"/tweakfld.awk "$(srcdir)"/tweakfld.in >_$@ || 
echo EXIT CODE: $$? >> _$@
        @rm -f errors.cleanup
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-mmap8k::
-       @echo $@
-       @$(AWK) '{ print }' "$(srcdir)"/mmap8k.in >_$@
-       @-$(CMP) "$(srcdir)"/mmap8k.in _$@ && rm -f _$@ || cp 
"$(srcdir)"/address@hidden address@hidden
-
-tradanch::
-       @echo $@
-       @$(AWK) --traditional -f "$(srcdir)"/tradanch.awk 
"$(srcdir)"/tradanch.in >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 # AIX /bin/sh exec's the last command in a list, therefore issue a ":"
 # command so that pid.sh is fork'ed as a child before being exec'ed.
 pid::
-       @echo pid
-       @echo Expect pid to fail with DJGPP and MinGW.
+       @echo $@
+       @echo Expect $@ to fail with DJGPP and MinGW.
        @AWKPATH="$(srcdir)" AWK=$(AWKPROG) $(SHELL) "$(srcdir)"/pid.sh $$$$ > 
_`basename address@hidden ; :
        @-$(CMP) "$(srcdir)"/pid.ok _`basename address@hidden && rm -f 
_`basename address@hidden
 
@@ -532,15 +585,14 @@ strftlng::
 
 nors::
        @echo $@
-       @echo A B C D E | tr -d '\12\15' | $(AWK) '{ print $$NF }' - 
"$(srcdir)"/nors.in > _$@
+       @echo A B C D E | tr -d '\12\15' | $(AWK) '{ print $$NF }' - 
"$(srcdir)"/nors.in > _$@ || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-fmtspcl.ok: fmtspcl.tok
+fmtspcl.ok: fmtspcl.tok Makefile
        @$(AWK) -v "sd=$(srcdir)" 'BEGIN {pnan = sprintf("%g",sqrt(-1)); nnan = 
sprintf("%g",-sqrt(-1)); pinf = sprintf("%g",-log(0)); ninf = 
sprintf("%g",log(0))} {sub(/positive_nan/,pnan); sub(/negative_nan/,nnan); 
sub(/positive_infinity/,pinf); sub(/negative_infinity/,ninf); 
sub(/fmtspcl/,(sd"/fmtspcl")); print}' < "$(srcdir)"/fmtspcl.tok > $@ 
2>/dev/null
 
 fmtspcl: fmtspcl.ok
        @echo $@
-       @echo Expect $@ to fail on MinGW if not built with MPFR
        @$(AWK) $(AWKFLAGS) -f "$(srcdir)"/fmtspcl.awk  --lint >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
        @-if test -z "$$AWKFLAGS" ; then $(CMP) address@hidden _$@ && rm -f _$@ 
; else \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
@@ -556,107 +608,75 @@ rsglstdin::
        @cat  "$(srcdir)"/rsgetline.in | AWKPATH="$(srcdir)" $(AWK) -f 
rsgetline.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-reint::
-       @echo $@
-       @$(AWK) --re-interval -f "$(srcdir)"/reint.awk "$(srcdir)"/reint.in >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 pipeio1::
        @echo $@
-       @$(AWK) -f "$(srcdir)"/pipeio1.awk >_$@
+       @$(AWK) -f "$(srcdir)"/pipeio1.awk >_$@ || echo EXIT CODE: $$? >> _$@
        @rm -f test1 test2
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 pipeio2::
        @echo $@
-       @echo Expect pipeio2 to fail with MinGW
-       @$(AWK) -v SRCDIR="$(srcdir)" -f "$(srcdir)"/pipeio2.awk >_$@
+       @echo Expect $@ to fail with MinGW.
+       @$(AWK) -v SRCDIR="$(srcdir)" -f "$(srcdir)"/pipeio2.awk >_$@ || echo 
EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 clobber::
        @echo $@
-       @$(AWK) -f "$(srcdir)"/clobber.awk >_$@
+       @$(AWK) -f "$(srcdir)"/clobber.awk >_$@ || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/clobber.ok seq && $(CMP) "$(srcdir)"/clobber.ok 
_$@ && rm -f _$@
-       @rm -f seq
+       @-rm -f seq
 
 arynocls::
        @echo $@
-       @-AWKPATH="$(srcdir)" $(AWK) -v INPUT="$(srcdir)"/arynocls.in -f 
arynocls.awk >_$@
+       @-AWKPATH="$(srcdir)" $(AWK) -v INPUT="$(srcdir)"/arynocls.in -f 
arynocls.awk >_$@ || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 getlnbuf::
        @echo $@
-       @-AWKPATH="$(srcdir)" $(AWK) -f getlnbuf.awk "$(srcdir)"/getlnbuf.in > 
_$@
-       @-AWKPATH="$(srcdir)" $(AWK) -f gtlnbufv.awk "$(srcdir)"/getlnbuf.in > 
_2$@
+       @-AWKPATH="$(srcdir)" $(AWK) -f getlnbuf.awk "$(srcdir)"/getlnbuf.in > 
_$@ || echo EXIT CODE: $$? >> _$@
+       @-AWKPATH="$(srcdir)" $(AWK) -f gtlnbufv.awk "$(srcdir)"/getlnbuf.in > 
_2$@ || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/getlnbuf.ok _$@ && $(CMP) "$(srcdir)"/getlnbuf.ok 
_2$@ && rm -f _$@ _2$@
 
 inetmesg::
        @echo These tests only work if your system supports the services
        @echo "'discard'" at port 9 and "'daytimed'" at port 13. Check your
-       @echo file /etc/services and do "'netstat -a'".
+       @-echo file /etc/services and do "'netstat -a'".
 
 inetechu::
-       @echo Expect inetechu to fail with DJGPP.
+       @echo Expect $@ to fail with DJGPP.
        @echo This test is for establishing UDP connections
-#      @$(AWK) 'BEGIN {print "" |& "/inet/udp/0/127.0.0.1/9"}'
        @-$(AWK) 'BEGIN {print "" |& "/inet/udp/0/127.0.0.1/9"}'
 
 inetecht::
-       @echo Expect inetecht to fail with DJGPP.
-       @echo Expect inetecht to time out with MinGW after 20 sec.
+       @echo Expect $@ to fail with DJGPP and MinGW.
        @echo This test is for establishing TCP connections
-#      @$(AWK) 'BEGIN {print "" |& "/inet/tcp/0/127.0.0.1/9"}'
        @-$(AWK) 'BEGIN {print "" |& "/inet/tcp/0/127.0.0.1/9"}'
 
 inetdayu::
-       @echo Expect inetdayu to fail with DJGPP.
+       @echo Expect $@ to fail with DJGPP.
        @echo This test is for bidirectional UDP transmission
-#      @$(AWK) 'BEGIN { print "" |& "/inet/udp/0/127.0.0.1/13"; \
-#      "/inet/udp/0/127.0.0.1/13" |& getline; print $0}'
        @-$(AWK) 'BEGIN { print "" |& "/inet/udp/0/127.0.0.1/13"; \
        "/inet/udp/0/127.0.0.1/13" |& getline; print $0}'
 
 inetdayt::
-       @echo Expect inetdayt to fail with DJGPP.
-       @echo Expect inetdayt to time out with MinGW after 41 sec.
+       @echo Expect $@ to fail with DJGPP and MinGW.
        @echo This test is for bidirectional TCP transmission
-#      @$(AWK) 'BEGIN { print "" |& "/inet/tcp/0/127.0.0.1/13"; \
-#      "/inet/tcp/0/127.0.0.1/13" |& getline; print $0}'
        @-$(AWK) 'BEGIN { print "" |& "/inet/tcp/0/127.0.0.1/13"; \
        "/inet/tcp/0/127.0.0.1/13" |& getline; print $0}'
 
 redfilnm::
        @echo $@
-       @$(AWK) -f "$(srcdir)"/redfilnm.awk srcdir="$(srcdir)" 
"$(srcdir)"/redfilnm.in >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-leaddig::
-       @echo $@
-       @$(AWK) -v x=2E  -f "$(srcdir)"/leaddig.awk >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-gsubtst3::
-       @echo $@
-       @$(AWK) --re-interval -f "$(srcdir)"/address@hidden 
"$(srcdir)"/address@hidden >_$@
+       @$(AWK) -f "$(srcdir)"/redfilnm.awk srcdir="$(srcdir)" 
"$(srcdir)"/redfilnm.in >_$@ || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 space::
        @echo $@
-       @$(AWK) -f ' ' "$(srcdir)"/space.awk >_$@ 2>&1 || echo EXIT CODE: $$? 
>>_$@
-#      @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+       @$(AWK) -f ' ' "$(srcdir)"/space.awk >_$@ 2>&1 || echo EXIT CODE: $$? 
>>_$@ || echo EXIT CODE: $$? >> _$@
        @-$(TESTOUTCMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-printf0::
-       @echo $@
-       @$(AWK) --posix -f "$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 rsnulbig::
        @echo $@
        @ : Suppose that block size for pipe is at most 128kB:
-#      @$(AWK) 'BEGIN { for (i = 1; i <= 128*64+1; i++) print 
"abcdefgh123456\n" }' 2>&1 | \
-#      $(AWK) 'BEGIN { RS = ""; ORS = "\n\n" }; { print }' 2>&1 | \
-#      $(AWK) '/^[^a]/; END{ print NR }' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @$(AWK) 'BEGIN { for (i = 1; i <= 128*64+1; i++) print 
"abcdefgh123456\n" }' 2>&1 | \
        $(AWK) 'BEGIN { RS = ""; ORS = "\n\n" }; { print }' 2>&1 | \
        $(AWK) ' /^[^a]/; END{ print NR }' >_$@ 2>&1 || echo EXIT CODE: $$? 
>>_$@
@@ -664,64 +684,12 @@ rsnulbig::
 
 rsnulbig2::
        @echo $@
-#      @$(AWK) 'BEGIN { ORS = ""; n = "\n"; for (i = 1; i <= 10; i++) n = (n 
n); \
-#              for (i = 1; i <= 128; i++) print n; print "abc\n" }' 2>&1 | \
-#              $(AWK) 'BEGIN { RS = ""; ORS = "\n\n" };{ print }' 2>&1 | \
-#              $(AWK) '/^[^a]/; END { print NR }' >_$@ 2>&1 || echo EXIT CODE: 
$$? >>_$@
        @$(AWK) 'BEGIN { ORS = ""; n = "\n"; for (i = 1; i <= 10; i++) n = (n 
n); \
                for (i = 1; i <= 128; i++) print n; print "abc\n" }' 2>&1 | \
                $(AWK) 'BEGIN { RS = ""; ORS = "\n\n" };{ print }' 2>&1 | \
                $(AWK) ' /^[^a]/; END { print NR }' >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-wideidx::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       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=ENU_USA.1252; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-widesub::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-widesub2::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-widesub3::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       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=ENU_USA.1252; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-ignrcas2::
-       @echo $@
-       @GAWKLOCALE=ENU_USA.1252 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? 
>> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-subamp::
-       @echo $@
-       @GAWKLOCALE=ENU_USA.1252 ; 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::
@@ -731,88 +699,42 @@ exitval1::
 
 fsspcoln::
        @echo $@
-       @$(AWK) -f "$(srcdir)"/address@hidden 'FS=[ :]+' 
"$(srcdir)"/address@hidden >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-rsstart1::
-       @echo $@
-       @$(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/rsstart1.in >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-rsstart2::
-       @echo $@
-       @$(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/rsstart1.in >_$@
+       @$(AWK) -f "$(srcdir)"/address@hidden 'FS=[ :]+' 
"$(srcdir)"/address@hidden >_$@ || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 rsstart3::
        @echo $@
-       @head "$(srcdir)"/rsstart1.in | $(AWK) -f "$(srcdir)"/rsstart2.awk >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-rtlen::
-       @echo $@
-       @"$(srcdir)"/address@hidden >_$@ || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-rtlen01::
-       @echo $@
-       @"$(srcdir)"/address@hidden >_$@ || echo EXIT CODE: $$? >>_$@
+       @head "$(srcdir)"/rsstart1.in | $(AWK) -f "$(srcdir)"/rsstart2.awk >_$@ 
|| echo EXIT CODE: $$? >> _$@
        @-$(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=ENU_USA.1252 ; export GAWKLOCALE ; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE ; \
        "$(srcdir)"/rtlen.sh >_$@ || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-nondec2::
-       @echo $@
-       @$(AWK) --non-decimal-data -v a=0x1 -f "$(srcdir)"/address@hidden >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-intarray::
-       @echo $@
-       @$(AWK) --non-decimal-data -f "$(srcdir)"/address@hidden >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-forcenum::
-       @echo $@
-       @$(AWK) --non-decimal-data -f "$(srcdir)"/address@hidden >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 nofile::
        @echo $@
        @$(AWK) '{}' no/such/file >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @sed "s/ (ENOENT)//" _$@ > address@hidden
-       @rm -f _$@
-#      @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-       @-$(CMP) "$(srcdir)"/address@hidden address@hidden && rm -f 
address@hidden
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 binmode1::
        @echo $@
        @$(AWK) -v BINMODE=3 'BEGIN { print BINMODE }' >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-subi18n::
-       @echo $@
-       @GAWKLOCALE=ENU_USA.1252 ; $(AWK) -f "$(srcdir)"/address@hidden > _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-concat4::
-       @echo $@
-       @GAWKLOCALE=ENU_USA.1252 ; $(AWK) -f "$(srcdir)"/address@hidden 
"$(srcdir)"/address@hidden > _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 devfd1::
        @echo $@
-       @echo Expect devfd1 to fail in MinGW
+       @echo Expect $@ to fail with MinGW.
        @$(AWK) -f "$(srcdir)"/address@hidden 4< "$(srcdir)"/devfd.in1 5< 
"$(srcdir)"/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 # The program text is the '1' which will print each record. How compact can 
you get?
 devfd2::
        @echo $@
-       @echo Expect devfd2 to fail in MinGW
+       @echo Expect $@ to fail with MinGW.
        @$(AWK) 1 /dev/fd/4 /dev/fd/5 4< "$(srcdir)"/devfd.in1 5< 
"$(srcdir)"/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -821,85 +743,16 @@ mixed1::
        @$(AWK) -f /dev/null --source 'BEGIN {return junk}' >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-mtchi18n::
-       @echo $@
-       @GAWKLOCALE=RUS_RUS.1251 ; 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=ENU_USA.1252; \
-       AWKPATH="$(srcdir)" $(AWK) --re-interval -f address@hidden 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-localenl::
-       @echo $@
-       @"$(srcdir)"/address@hidden >_$@ 2>/dev/null
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbprintf1::
-       @echo $@
-       @echo Expect mbprintf1 to fail with DJGPP and MinGW.
-       @GAWKLOCALE=ENU_USA.1252 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbprintf2::
-       @echo $@
-       @GAWKLOCALE=JPN_JPN.932 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? 
>> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbprintf3::
-       @echo $@
-       @GAWKLOCALE=ENU_USA.1252 ; export GAWKLOCALE ; \
-       $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbprintf4::
-       @echo $@
-       @echo Expect mbprintf4 to fail with MinGW and DJGPP
-       @GAWKLOCALE=ENU_USA.1252 ; 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 \
+       @-case `uname` in \
        CYGWIN* | MINGW32* | *MS-DOS*) echo this test fails on this system --- 
skipping $@ ;; \
        *) \
-       GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
+       [ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE ; \
        $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@ ; \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        esac
 
-mbfw1::
-       @echo $@
-       @echo Expect mbfw1 to fail with DJGPP and MinGW.
-       @GAWKLOCALE=ENU_USA.1252 ; 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 $@
-       @echo Expect mbstr1 to fail with DJGPP and MinGW.
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mbstr2::
-       @echo $@
-       @echo Expect mbstr2 to fail with DJGPP and MinGW.
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       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: $$?  >>_$@
@@ -907,19 +760,18 @@ printfbad2: printfbad2.ok
 
 beginfile1::
        @echo $@
-       @echo Expect beginfile1 to fail with DJGPP due to error message 
differences.
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 
"$(srcdir)"/address@hidden . ./no/such/file Makefile  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 beginfile2:
        @echo $@
-       @-( cd "$(srcdir)" && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)" 
$(abs_srcdir)/address@hidden $(abs_srcdir)/address@hidden ) > _$@ 2>&1
-#      @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+       @-( cd "$(srcdir)" && LC_ALL=C AWK="$(abs_builddir)/$(AWKPROG)" 
$(abs_srcdir)/address@hidden $(abs_srcdir)/address@hidden ) > _$@ 2>&1 || echo 
EXIT CODE: $$? >> _$@
        @-$(TESTOUTCMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 dumpvars::
        @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) --dump-variables 1 < 
"$(srcdir)"/address@hidden >/dev/null 2>&1 || echo EXIT CODE: $$? >>_$@
+       @AWKPATH="$(srcdir)" $(AWK) --dump-variables 1 < 
"$(srcdir)"/address@hidden >/dev/null 2>&1 || echo EXIT CODE: $$? >>_$@ || echo 
EXIT CODE: $$? >> _$@
        @grep -v ENVIRON < awkvars.out | grep -v PROCINFO > _$@; rm awkvars.out
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -934,7 +786,7 @@ profile1:
        @$(AWK) -f "$(srcdir)"/xref.awk "$(srcdir)"/dtdgport.awk > 
address@hidden
        @$(AWK) address@hidden -f "$(srcdir)"/xref.awk
        @$(AWK) -f ./address@hidden "$(srcdir)"/dtdgport.awk > address@hidden ; 
rm address@hidden
-       @$(CMP) address@hidden address@hidden && rm address@hidden || { echo 
EXIT CODE: $$? >>_$@ ; \
+       @-$(CMP) address@hidden address@hidden && rm address@hidden || { echo 
EXIT CODE: $$? >>_$@ ; \
        cp "$(srcdir)"/dtdgport.awk address@hidden ; }
 
 profile2:
@@ -949,17 +801,6 @@ profile3:
        @sed 1,2d < address@hidden > _$@; rm address@hidden
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-profile4:
-       @echo $@
-       @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-profile5:
-       @echo $@
-       @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
-#      @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-       @-$(TESTOUTCMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 profile6:
        @echo $@
        @$(AWK) address@hidden -f "$(srcdir)"/address@hidden > /dev/null
@@ -972,116 +813,40 @@ profile7:
        @sed 1,2d < address@hidden > _$@; rm address@hidden
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-profile8:
-       @echo $@
-       @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-profile9:
-       @echo $@
-       @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-profile10:
-       @echo $@
-       @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-posix2008sub:
-       @echo $@
-       @$(AWK) --posix -f "$(srcdir)"/address@hidden > _$@ 2>&1
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-next:
-       @echo $@
-       @-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/address@hidden > _$@ 2>&1
-       @-LC_ALL=C $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-exit:
-       @echo $@
-       @-AWK="$(AWKPROG)" "$(srcdir)"/address@hidden > _$@ 2>&1
-#      @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-       @-$(TESTOUTCMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-rri1::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       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
+       @$(AWK) -M -vPREC=double -f "$(srcdir)"/address@hidden > _$@ 2>&1 || 
echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 mpfrexprange:
        @echo $@
-       @$(AWK) -M -vPREC=53 -f "$(srcdir)"/address@hidden > _$@ 2>&1
+       @$(AWK) -M -vPREC=53 -f "$(srcdir)"/address@hidden > _$@ 2>&1 || echo 
EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 mpfrrnd:
        @echo $@
-       @$(AWK) -M -vPREC=53 -f "$(srcdir)"/address@hidden > _$@ 2>&1
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mpfrrndeval:
-       @echo $@
-       @$(AWK) -M -f "$(srcdir)"/address@hidden > _$@ 2>&1
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-mpfrnegzero:
-       @echo $@
-       @$(AWK) -M -f "$(srcdir)"/address@hidden > _$@ 2>&1
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mpfrnr:
-       @echo $@
-       @$(AWK) -M -vPREC=113 -f "$(srcdir)"/address@hidden 
"$(srcdir)"/address@hidden > _$@
+       @$(AWK) -M -vPREC=53 -f "$(srcdir)"/address@hidden > _$@ 2>&1 || echo 
EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 mpfrsort:
        @echo $@
-       @$(AWK) -M -vPREC=53 -f "$(srcdir)"/address@hidden > _$@ 2>&1
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mpfrbigint:
-       @echo $@
-       @$(AWK) -M -f "$(srcdir)"/address@hidden > _$@ 2>&1
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mpfrsqrt:
-       @echo $@
-       @$(AWK) -M -f "$(srcdir)"/address@hidden > _$@ 2>&1
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mpfrstrtonum:
-       @echo $@
-       @$(AWK) -M -f "$(srcdir)"/address@hidden > _$@ 2>&1
+       @$(AWK) -M -vPREC=53 -f "$(srcdir)"/address@hidden > _$@ 2>&1 || echo 
EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 mpfruplus:
        @echo $@
-       @$(AWK) -M -f "$(srcdir)"/uplus.awk > _$@ 2>&1
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mpgforcenum:
-       @echo $@
-       @$(AWK) -M -f "$(srcdir)"/address@hidden > _$@ 2>&1
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-mpfrrem:
-       @echo $@
-       @$(AWK) -M -f "$(srcdir)"/address@hidden > _$@ 2>&1
+       @$(AWK) -M -f "$(srcdir)"/uplus.awk > _$@ 2>&1 || echo EXIT CODE: $$? 
>> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 mpfrmemok1:
        @echo $@
-       @$(AWK) -p- -M -f "$(srcdir)"/address@hidden 2>&1 | sed 1d > _$@
+       @$(AWK) -p- -M -f "$(srcdir)"/address@hidden 2>&1 | sed 1d > _$@ || 
echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 jarebug::
        @echo $@
-       @echo Expect jarebug to fail with DJGPP.
-       @"$(srcdir)"/address@hidden "$(AWKPROG)" "$(srcdir)"/address@hidden 
"$(srcdir)"/address@hidden "_$@"
+       @echo Expect $@ to fail with DJGPP.
+       @"$(srcdir)"/address@hidden "$(AWKPROG)" "$(srcdir)"/address@hidden 
"$(srcdir)"/address@hidden "_$@" || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 ordchr2::
@@ -1174,28 +939,25 @@ inplace3::
 
 testext::
        @echo $@
-#      @$(AWK) '/^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > 
testext.awk
        @$(AWK) ' /^(@load|BEGIN)/,/^}/' "$(top_srcdir)"/extension/testext.c > 
testext.awk
        @$(AWK) -f ./testext.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ testext.awk 
testexttmp.txt
 
 getfile:
        @echo $@
-       @echo Expect getfile to fail with MinGW.
+       @echo Expect $@ to fail with MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -v TESTEXT_QUIET=1 -ltestext -f 
address@hidden < $(srcdir)/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 readdir:
+       @echo $@
+       @echo Expect $@ to fail with MinGW.
        @if [ "`uname`" = Linux ] && [ "`stat -f . 2>/dev/null | awk 'NR == 2 { 
print $$NF }'`" = nfs ];  then \
        echo This test may fail on GNU/Linux systems when run on NFS or JFS 
filesystems.; \
        echo If it does, try rerunning on an ext'[234]' filesystem. ; \
        fi
-       @echo $@
-       @echo This test may fail on MinGW if $(LS) does not report full Windows 
file index as the inode
-       @$(AWK) -f "$(srcdir)"/readdir.awk "$(top_srcdir)" > _$@
-#      @ls -afi "$(top_srcdir)" > _dirlist
+       @$(AWK) -f "$(srcdir)"/readdir.awk "$(top_srcdir)" > _$@ || echo EXIT 
CODE: $$? >> _$@
        @$(LS) -afi "$(top_srcdir)" > _dirlist
-#      @ls -lna "$(top_srcdir)" | sed 1d > _longlist
        @$(LS) -lna "$(top_srcdir)" | sed 1d > _longlist
        @$(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@  \
                -v dirlist=_dirlist -v longlist=_longlist > address@hidden
@@ -1203,12 +965,21 @@ readdir:
 
 readdir_test:
        @echo $@
-       @echo This test may fail on MinGW if $(LS) does not report full Windows 
file index as the inode
-       @$(AWK) -lreaddir -F$(SLASH) '{printf "[%s] [%s] [%s] [%s]\n", $$1, 
$$2, $$3, $$4}' "$(top_srcdir)" > address@hidden
+       @echo Expect $@ to fail with MinGW.
+       @$(AWK) -lreaddir -F/ '{printf "[%s] [%s] [%s] [%s]\n", $$1, $$2, $$3, 
$$4}' "$(top_srcdir)" > address@hidden
        @$(AWK) -lreaddir_test '{printf "[%s] [%s] [%s] [%s]\n", $$1, $$2, $$3, 
$$4}' "$(top_srcdir)" > _$@
        @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
 
+readdir_retest:
+       @echo $@
+       @echo Expect $@ to fail with MinGW.
+       @$(AWK) -lreaddir -F/ -f "$(srcdir)"/address@hidden "$(top_srcdir)" > 
address@hidden
+       @$(AWK) -lreaddir_test -F/ -f "$(srcdir)"/address@hidden 
"$(top_srcdir)" > _$@
+       @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
+
 fts:
+       @echo $@
+       @echo Expect $@ to fail with MinGW.
        @case `uname` in \
        IRIX) \
        echo This test may fail on IRIX systems when run on an NFS filesystem.; 
\
@@ -1217,18 +988,13 @@ fts:
        echo This test may fail on CYGWIN systems when run on an NFS 
filesystem.; \
        echo If it does, try rerunning on an ntfs filesystem. ;; \
        esac
-       @echo $@
-       @echo Expect $@ to fail with MinGW because function 'fts' is not 
defined.
-#      @$(AWK) -f "$(srcdir)"/fts.awk
-       @$(AWK) -f "$(srcdir)"/fts.awk || echo EXIT CODE: $$? >>_$@
+       @$(AWK) -f "$(srcdir)"/fts.awk || echo EXIT CODE: $$? >> _$@
        @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
 
+# BINMODE=2 is needed for PC tests.
 charasbytes:
        @echo $@
-#      @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
-#      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: $$? >>_$@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
        AWKPATH="$(srcdir)" $(AWK) -b -v BINMODE=2 -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 _$@
@@ -1247,72 +1013,29 @@ symtab8:
 
 symtab9:
        @echo $@
-       @$(AWK) -f "$(srcdir)"/address@hidden >_$@
+       @$(AWK) -f "$(srcdir)"/address@hidden >_$@ || echo EXIT CODE: $$? >> _$@
        @rm -f testit.txt
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 reginttrad:
        @echo $@
-       @$(AWK) --traditional -r -f "$(srcdir)"/address@hidden > _$@
+       @$(AWK) --traditional -r -f "$(srcdir)"/address@hidden > _$@ || echo 
EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 colonwarn:
        @echo $@
        @for i in 1 2 3 ; \
        do $(AWK) -f "$(srcdir)"/address@hidden $$i < 
"$(srcdir)"/address@hidden ; \
-       done > _$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-clos1way:
-       @echo $@
-       @echo Expect clos1way to fail with DJGPP.
-       @AWKPATH="$(srcdir)" LC_ALL=C $(AWK) -f address@hidden  >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-dfamb1:
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-randtest::
-       @echo $@
-       @GAWK="$(AWKPROG)" "$(srcdir)"/randtest.sh >_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-backbigs1:
-       @echo $@
-       @echo Expect backbigs1 to fail with MinGW and DJGPP
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-backsmalls1:
-       @echo $@
-       @echo Expect backsmalls1 to fail with MinGW and DJGPP
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       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=ENU_USA.1252; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       done > _$@ || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 dbugeval::
        @echo $@
-       @if [ -t 0 ]; then \
+       @-if [ -t 0 ]; then \
        $(AWK) --debug -f /dev/null < "$(srcdir)"/address@hidden > _$@  2>&1 || 
echo EXIT CODE: $$? >>_$@ ; \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        fi
 
-printhuge::
-       @echo $@
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; \
-       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: $$? >>_$@
@@ -1323,40 +1046,10 @@ genpot:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden --gen-pot >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-paramasfunc1::
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden --posix >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-paramasfunc2::
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden --posix >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 negtime::
        @echo $@
        @TZ=GMT AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
-       @AWKPATH="$(srcdir)" $(AWK) -f checknegtime.awk 
"$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-dbugtypedre1:
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -D -f address@hidden < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-dbugtypedre2:
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -D -f address@hidden < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-dbugeval2:
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -D -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: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+       @-AWKPATH="$(srcdir)" $(AWK) -f checknegtime.awk 
"$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 watchpoint1:
        @echo $@
@@ -1380,45 +1073,49 @@ pty2:
        *) AWKPATH="$(srcdir)" $(AWK) -f address@hidden | od -c | $(AWK) '{ $$1 
= $$1 ; print }' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ;; \
        esac
-rscompat:
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) --traditional -f address@hidden 
"$(srcdir)/address@hidden" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-symtab10:
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -D -f address@hidden < 
"$(srcdir)/address@hidden" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 ignrcas3::
        @echo $@
-       @echo Expect ignrcas3 to fail with MinGW and DJGPP
-#      @if locale -a | grep el_GR.iso88597 > /dev/null ; then \
-#      GAWKLOCALE=el_GR.iso88597 \
-#      AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@ ; \
-#      $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
-#      fi
-       @if locale -a | grep ell_GRC.1253 > /dev/null ; then \
-       @GAWKLOCALE=ell_GRC.1253 \
+       @echo Expect $@ to fail with DJGPP and MinGW.
+       @-if locale -a | grep ell_GRC.1253 > /dev/null ; then \
+       [ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ell_GRC.1253 ; export GAWKLOCALE; \
        AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@ ; \
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
+       $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        fi
 
 arrdbg:
        @echo $@
-       @$(AWK) -v "okfile=./address@hidden" -f "$(srcdir)"/address@hidden | 
grep array_f >_$@
+       @$(AWK) -v "okfile=./address@hidden" -f "$(srcdir)"/address@hidden | 
grep array_f >_$@ || echo EXIT CODE: $$? >> _$@
        @-$(CMP) ./address@hidden _$@ && rm -f _$@ ./address@hidden
 
-fwtest3:
+sourcesplit:
        @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < "$(srcdir)"/fwtest2.in 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @AWKPATH="$(srcdir)" $(AWK) --source='BEGIN { a = 5;' --source='print a 
}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-sourcesplit:
+# Use [:] in the regexp to keep MSYS from converting the /'s to \'s.
+nonfatal1:
        @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) --source='BEGIN { a = 5;' --source='print a 
}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @echo Expect $@ to fail with DJGPP.
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 2>&1 | $(AWK) '{print 
gensub(/invalid[:].*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+# 4/2018: On first call to $(CMP), send to /dev/null even with -s for MinGW.
+nlstringtest::
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=FRA_FRA.1252 ; export GAWKLOCALE ; 
\
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)" >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
+       @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ > /dev/null ; \
+       then \
+               rm -f _$@ ; \
+       else \
+               $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
+       fi
+
+longwrds:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden -v SORT="$(SORT)" < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
@@ -1621,6 +1318,12 @@ concat3:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+concat4:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; 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: $$? >>_$@
@@ -1661,6 +1364,12 @@ delfunc:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+dfamb1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; 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: $$? >>_$@
@@ -1683,7 +1392,7 @@ exit2:
 
 exitval2:
        @echo $@
-       @echo Expect exitval2 to fail with MinGW
+       @echo Expect $@ to fail with MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -1842,6 +1551,11 @@ gsubtst2:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+gsubtst3:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --re-interval < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 gsubtst4:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -1852,6 +1566,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: $$? >>_$@
@@ -1875,7 +1595,6 @@ hex2:
 hsprint:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-#      @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
        @-$(TESTOUTCMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 inpref:
@@ -1903,20 +1622,24 @@ iobug1:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+leaddig:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 leadnl:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-longsub:
+litoct:
        @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --traditional < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-longwrds:
+longsub:
        @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden SORT=sort < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-#      @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 manglprm:
@@ -1944,6 +1667,11 @@ minusstr:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+mmap8k:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 nasty:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -2004,14 +1732,6 @@ nlstrina:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-nlstringtest::
-       @echo $@
-       @echo Expect nlstringtest to fail with DJGPP and MinGW when not built 
with gettext.
-#      @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 LANGUAGE=
-       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=FRA_FRA.1252 LANGUAGE= ; \
-       AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)" >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 noeffect:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --lint >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
@@ -2032,6 +1752,11 @@ noloop2:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+nonl:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --lint < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 noparms:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -2117,6 +1842,16 @@ opasnslf:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+paramasfunc1:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --posix >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+paramasfunc2:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --posix >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 paramdup:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -2154,7 +1889,12 @@ parseme:
 
 pcntplus:
        @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+posix2008sub:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --posix >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 prdupval:
@@ -2167,6 +1907,11 @@ prec:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+printf0:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --posix >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 printf1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -2204,6 +1949,11 @@ rand:
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        fi
 
+randtest:
+       @echo $@
+       @-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/address@hidden  > _$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 range1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2269,11 +2019,22 @@ 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=ENU_USA.1252; 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: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+rscompat:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --traditional < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 rsnul1nl:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2296,13 +2057,13 @@ rstest3:
 
 rstest4:
        @echo $@
-       @echo Expect rstest4 to fail with MinGW
+       @echo Expect $@ to fail with MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 rstest5:
        @echo $@
-       @echo Expect rstest5 to fail with MinGW
+       @echo Expect $@ to fail with MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -2338,13 +2099,9 @@ setrec1:
 
 sigpipe1:
        @echo $@
-       @-case `uname` in \
-       *MS-DOS*) echo This test fails on DJGPP --- skipping $@ ;; \
-       *) \
-       AWKPATH="$(srcdir)" ; export AWKPATH; \
-       $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
-       $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
-       esac
+       @echo Expect $@ to fail with DJGPP.
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 sortempty:
        @echo $@
@@ -2383,7 +2140,7 @@ splitwht:
 
 status-close:
        @echo $@
-       @echo Expect status-close to fail with MinGW
+       @echo Expect $@ to fail with MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -2404,15 +2161,27 @@ strnum2:
 
 strtod:
        @echo $@
-       @echo Expect strtod to fail with DJGPP.
+       @echo Expect $@ to fail with DJGPP.
        @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=ENU_USA.1252; 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=ENU_USA.1252; 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: $$? >>_$@
@@ -2443,6 +2212,16 @@ synerr2:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+tailrecurse:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+tradanch:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --traditional < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 uninit2:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --lint >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
@@ -2483,6 +2262,42 @@ uplus:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+wideidx:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; 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=ENU_USA.1252; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+widesub:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+widesub2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+widesub3:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; 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=ENU_USA.1252; 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: $$? >>_$@
@@ -2503,12 +2318,32 @@ zeroflag:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+fflush:
+       @echo $@
+       @-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/address@hidden  > _$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 getlnhd:
        @echo $@
-       @echo Expect getlnhd to fail if pipe does not use a Unixy shell
+       @echo Expect $@ to fail with DJGPP and MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+localenl:
+       @echo $@
+       @-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/address@hidden  > _$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+rtlen:
+       @echo $@
+       @-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/address@hidden  > _$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+rtlen01:
+       @echo $@
+       @-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/address@hidden  > _$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 aadelete1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -2541,37 +2376,44 @@ arraysort:
 
 backw:
        @echo $@
-       @echo Expect backw to fail with DJGPP.
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+clos1way:
+       @echo $@
+       @echo Expect $@ to fail with DJGPP.
+       @[ -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 $@
-       @echo Expect clos1way2 to fail with DJGPP.
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 clos1way3:
        @echo $@
-       @echo Expect clos1way3 to fail with DJGPP.
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 clos1way4:
        @echo $@
-       @echo Expect clos1way4 to fail with DJGPP.
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 clos1way5:
        @echo $@
-       @echo Expect clos1way5 to fail with DJGPP.
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 clos1way6:
        @echo $@
-       @echo Expect clos1way6 to fail with DJGPP and MinGW
+       @echo Expect $@ to fail with DJGPP and MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -2580,16 +2422,41 @@ crlf:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+dbugeval2:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --debug < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+dbugtypedre1:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --debug < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+dbugtypedre2:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --debug < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 delsub:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+exit:
+       @echo $@
+       @-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/address@hidden  > _$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
+       @-$(TESTOUTCMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 fieldwdth:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+forcenum:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --non-decimal-data >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 fpat1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2660,6 +2527,11 @@ fwtest2:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+fwtest3:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 fwtest4:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2702,7 +2574,7 @@ gensub3:
 
 getlndir:
        @echo $@
-       @echo Expect getlndir to fail with DJGPP due to error message 
differences.
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -2713,11 +2585,13 @@ gnuops2:
 
 gnuops3:
        @echo $@
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 gnureops:
        @echo $@
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -2738,7 +2612,7 @@ icasers:
 
 id:
        @echo $@
-       @echo Expect id to fail with DJGPP.
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -2752,6 +2626,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=ENU_USA.1252; 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: $$? >>_$@
@@ -2782,6 +2662,11 @@ indirectcall2:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+intarray:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --non-decimal-data >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 isarrayunset:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -2847,31 +2732,54 @@ match3:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+mbstr1:
+       @echo $@
+       @echo Expect $@ to fail with DJGPP and MinGW.
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbstr2:
+       @echo $@
+       @echo Expect $@ to fail with DJGPP and MinGW.
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; 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: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 nastyparm:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+next:
+       @echo $@
+       @-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/address@hidden  > _$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 nondec:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-nonfatal1:
+nondec2:
        @echo $@
-       @echo Expect nonfatal1 to fail with DJGPP.
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 2>&1 | $(AWK) '{print 
gensub(/invalid.*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --non-decimal-data >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 nonfatal2:
        @echo $@
-       @echo Expect nonfatal2 to fail with DJGPP due to error message 
differences.
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 nonfatal3:
        @echo $@
-       @echo Expect nonfatal3 to fail with DJGPP.
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -2883,7 +2791,6 @@ patsplit:
 posix:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-#      @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
        @-$(TESTOUTCMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 printfbad1:
@@ -2901,11 +2808,42 @@ printfbad4:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+printhuge:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; 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: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+profile4:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --pretty-print=_$@ >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+profile5:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --pretty-print=_$@ >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(TESTOUTCMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+profile8:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --pretty-print=_$@ >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+profile9:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --pretty-print=_$@ >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+profile10:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --pretty-print=_$@ >_$@ 
2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 regnul1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -2918,14 +2856,36 @@ regnul2:
 
 regx8bit:
        @echo $@
+       @echo Expect $@ to fail with DJGPP.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+reint:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --re-interval < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+reint2:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --re-interval < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 rsgetline:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+rsstart1:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+rsstart2:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 rstest6:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -3016,6 +2976,11 @@ symtab7:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+symtab10:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  --debug < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 typedregex1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
@@ -3058,7 +3023,7 @@ typeof5:
 
 timeout:
        @echo $@
-       @echo Expect timeout to fail with DJGPP and MinGW
+       @echo Expect $@ to fail with DJGPP and MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -3070,7 +3035,6 @@ double1:
 double2:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-#      @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
        @-$(TESTOUTCMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 intformat:
@@ -3088,10 +3052,29 @@ asorti:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+backbigs1:
+       @echo $@
+       @echo Expect $@ to fail with DJGPP and MinGW.
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+backsmalls1:
+       @echo $@
+       @echo Expect $@ to fail with DJGPP and MinGW.
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; 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=ENU_USA.1252; 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: $$? >>_$@
-#      @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
        @-$(TESTOUTCMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 fnarydel:
@@ -3108,6 +3091,51 @@ fnparydl:
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ; \
        fi
 
+lc_num1:
+       @echo $@
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbfw1:
+       @echo $@
+       @echo Expect $@ to fail with DJGPP and MinGW.
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbprintf1:
+       @echo $@
+       @echo Expect $@ to fail with DJGPP and MinGW.
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; 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=ENU_USA.1252; export GAWKLOCALE; \
+       AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mbprintf4:
+       @echo $@
+       @echo Expect $@ to fail with DJGPP and MinGW.
+       @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; 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=RUS_RUS.1251; 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: $$? >>_$@
@@ -3135,13 +3163,13 @@ fnmatch:
 
 fork:
        @echo $@
-       @echo Expect $@ to fail with MinGW because fork.dll is not available
+       @echo Expect $@ to fail with MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 fork2:
        @echo $@
-       @echo Expect $@ to fail with MinGW because fork.dll is not available
+       @echo Expect $@ to fail with MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -3175,22 +3203,69 @@ time:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+mpfrbigint:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  -M >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mpfrfield:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  -M < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mpfrnegzero:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  -M >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mpfrnr:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  -M < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mpfrrem:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  -M >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mpfrrndeval:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  -M >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mpfrsqrt:
+       @echo $@
+       @echo Expect $@ to fail with DJGPP.
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  -M >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mpfrstrtonum:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  -M >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+mpgforcenum:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  -M >_$@ 2>&1 || echo 
EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 # end of file Maketests
 
 # Targets generated for other tests:
 
 Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests
-       files=`cd "$(srcdir)" && echo *.awk *.in`; \
+       files=`cd "$(srcdir)" && echo *.awk *.in *.sh`; \
        $(AWK) -f "$(srcdir)"/Gentests "$(srcdir)"/Makefile.am $$files > $@
 
 clean-local:
        rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \
        seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \
-       mmap8k.ok profile1.ok readdir_test.ok
+       readdir_test.ok readdir_retest.ok \
+       profile1.ok
 
 # An attempt to print something that can be grepped for in build logs
 pass-fail:
-       @COUNT=`ls _* 2>/dev/null | wc -l` ; \
+       @-COUNT=`ls _* 2>/dev/null | wc -l` ; \
        if test $$COUNT = 0 ; \
        then    echo ALL TESTS PASSED ; \
        else    echo $$COUNT TESTS FAILED ; exit 1; \
@@ -3215,7 +3290,7 @@ diffout:
 # convenient way to scan valgrind results for errors
 valgrind-scan:
        @echo "Scanning valgrind log files for problems:"
-       @$(AWK) -f "$(srcdir)"/valgrind.awk log.[0-9]*
+       @-$(AWK) -f "$(srcdir)"/valgrind.awk log.[0-9]*
 
 # This target is for testing with electric fence.
 efence:
diff --git a/pc/Makefile.tst b/pc/Makefile.tst.original
similarity index 100%
copy from pc/Makefile.tst
copy to pc/Makefile.tst.original

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

Summary of changes:
 ChangeLog                                  |    5 +
 Makefile.am                                |    5 +-
 Makefile.in                                |    5 +-
 pc/ChangeLog                               |    8 +
 pc/GenMakefileTst.awk                      |    4 +-
 pc/Makefile.tst                            | 1265 +++++++++++++++-------------
 pc/{Makefile.tst => Makefile.tst.original} |    0
 7 files changed, 694 insertions(+), 598 deletions(-)
 copy pc/{Makefile.tst => Makefile.tst.original} (100%)


hooks/post-receive
-- 
gawk



reply via email to

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