Finish fixing GenMakefiletst.awk script.

3 files changed, 60 insertions, 55 deletions

diff --git a/pc/ChangeLog b/pc/ChangeLog
index e71ef987..3fc745ec 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-12         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* GenMakefileTst.awk: Fix the test for the @echo line.
+	* Makefile.tst: Regenerated.
+
 2021-05-10         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* GenMakefileTst.awk: Use ~ to match @echo line instead of ==,
diff --git a/pc/GenMakefileTst.awk b/pc/GenMakefileTst.awk
index daa720c1..964573c9 100644
--- a/pc/GenMakefileTst.awk
+++ b/pc/GenMakefileTst.awk
@@ -109,7 +109,7 @@ function print_recipe(		i, start)
 		return
 
 	# First line if it's @echo $@
-	if (recipe_lines[2] ~ /\t@echo $@/) {
+	if (recipe_lines[2] ~ /\t@echo [$]@/) {
 		start = 3
 		print recipe_lines[2]
 	} else
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 7bab0e3d..50bcf8e4 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -545,8 +545,8 @@ compare::
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 inftest::
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@echo This test is very machine specific...
 	@$(AWK) -f "$(srcdir)"/inftest.awk | sed "s/inf/Inf/g" >_$@ || echo EXIT CODE: $$? >> _$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -579,16 +579,16 @@ strftime::
 	@-$(CMP) strftime.ok _$@ && rm -f _$@ strftime.ok || exit 0
 
 devfd::
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@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)"/$@.ok _$@ && rm -f _$@
 
 # This cannot be autogenerated; we want it to read the input name
 # on the command line.
 errno:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -601,8 +601,8 @@ tweakfld::
 # 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 Expect $@ to fail with DJGPP and MinGW.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@AWKPATH="$(srcdir)" AWK=$(AWKPROG) $(SHELL) "$(srcdir)"/pid.sh $$$$ > _`basename $@` ; :
 	@-$(CMP) "$(srcdir)"/pid.ok _`basename $@` && rm -f _`basename $@`
 
@@ -646,8 +646,8 @@ pipeio1::
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 pipeio2::
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@$(AWK) -v SRCDIR="$(srcdir)" -f "$(srcdir)"/pipeio2.awk >_$@ || echo EXIT CODE: $$? >> _$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -757,15 +757,15 @@ binmode1::
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 devfd1::
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@$(AWK) -f "$(srcdir)"/$@.awk 4< "$(srcdir)"/devfd.in1 5< "$(srcdir)"/devfd.in2 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 # The program text is the '1' which will print each record. How compact can you get?
 devfd2::
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@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)"/$@.ok _$@ && rm -f _$@
 
@@ -790,8 +790,8 @@ printfbad2: printfbad2.ok
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 beginfile1::
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)"/$@.awk . ./no/such/file Makefile  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -892,8 +892,8 @@ mpfrmemok1:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 jarebug::
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@"$(srcdir)"/$@.sh "$(AWKPROG)" "$(srcdir)"/$@.awk "$(srcdir)"/$@.in "_$@" || echo EXIT CODE: $$? >> _$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -1042,14 +1042,14 @@ testext::
 	else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ testext.awk testexttmp.txt ; fi
 
 getfile:
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -v TESTEXT_QUIET=1 -ltestext -f $@.awk < $(srcdir)/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 readdir:
-	@echo Expect $@ to fail with MinGW.
 	@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. ; \
@@ -1074,8 +1074,8 @@ readdir_retest:
 	@-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
 
 fts:
-	@echo Expect $@ to fail with MinGW.
 	@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.; \
@@ -1096,8 +1096,8 @@ charasbytes:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 symtab6:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -1153,8 +1153,8 @@ watchpoint1:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 pty1:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@-case `uname` in \
 	*[Oo][Ss]/390*) : ;; \
 	*) AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
@@ -1162,8 +1162,8 @@ pty1:
 	esac
 
 pty2:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@-case `uname` in \
 	*[Oo][Ss]/390*) : ;; \
 	*) AWKPATH="$(srcdir)" $(AWK) -f $@.awk | od -c | $(AWK) '{ $$1 = $$1 ; print }' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
@@ -1171,8 +1171,8 @@ pty2:
 	esac
 
 ignrcas3::
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@
+	@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 $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
@@ -1203,8 +1203,8 @@ nsbad_cmd:
 
 # Use [:] in the regexp to keep MSYS from converting the /'s to \'s.
 nonfatal1:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk 2>&1 | $(AWK) '{print gensub(/invalid[:].*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -1541,8 +1541,8 @@ exit2:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 exitval2:
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -1748,8 +1748,8 @@ hex2:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 hsprint:
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(TESTOUTCMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2119,8 +2119,8 @@ rand:
 	else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
 
 randtest:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@-$(LOCALES) AWK="$(AWKPROG)" "$(srcdir)"/$@.sh  > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2242,14 +2242,14 @@ rstest3:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 rstest4:
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 rstest5:
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2284,8 +2284,8 @@ setrec1:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 sigpipe1:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2325,8 +2325,8 @@ splitwht:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 status-close:
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2351,8 +2351,8 @@ strnum2:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 strtod:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2525,8 +2525,8 @@ fflush:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 getlnhd:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2588,45 +2588,45 @@ arraytype:
 	else $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; fi
 
 backw:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 clos1way:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=C; export GAWKLOCALE; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 clos1way2:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 clos1way3:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 clos1way4:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 clos1way5:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 clos1way6:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2811,8 +2811,8 @@ gensub3:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 getlndir:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2822,14 +2822,14 @@ gnuops2:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 gnuops3:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 gnureops:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2849,8 +2849,8 @@ icasers:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 id:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2901,8 +2901,8 @@ indirectcall2:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 inf-nan-torture:
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2977,15 +2977,15 @@ match3:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 mbstr1:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 mbstr2:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -3026,14 +3026,14 @@ nondec2:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 nonfatal2:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 nonfatal3:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -3164,8 +3164,8 @@ regnul2:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 regx8bit:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -3321,8 +3321,8 @@ symtab11:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 timeout:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -3402,15 +3402,15 @@ asorti:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 backbigs1:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 backsmalls1:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -3422,8 +3422,8 @@ backsmalls2:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 fmttest:
-	@echo Expect $@ to fail with MinGW.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(TESTOUTCMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -3448,15 +3448,15 @@ lc_num1:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 mbfw1:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 mbprintf1:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -3474,8 +3474,8 @@ mbprintf3:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 mbprintf4:
-	@echo Expect $@ to fail with DJGPP and MinGW.
 	@echo $@ $(ZOS_FAIL)
+	@echo Expect $@ to fail with DJGPP and MinGW.
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -3512,14 +3512,14 @@ fnmatch:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 fork:
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 fork2:
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -3529,8 +3529,8 @@ functab4:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 functab5:
-	@echo Expect $@ to fail with MinGW.
 	@echo $@
+	@echo Expect $@ to fail with MinGW.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -3610,8 +3610,8 @@ mpfrrndeval:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 mpfrsqrt:
-	@echo Expect $@ to fail with DJGPP.
 	@echo $@
+	@echo Expect $@ to fail with DJGPP.
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  -M >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@