Merge branch 'gawk-5.1-stable'

7 files changed, 35 insertions, 22 deletions

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 894dea38..62534fdf 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2021-10-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.tst: Regenerated.
+
 2021-09-17         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.tst: Regenerated.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 37183624..09213462 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -340,9 +340,9 @@ EXPECTED_FAIL_MINGW = \
 # List of tests that fail on z/OS
 EXPECTED_FAIL_ZOS = \
 	aasort aasorti arraysort asort asorti backbigs1 backsmalls1 \
-	backsmalls2 beginfile1 beginfile2 charasbytes clos1way6 concat4 \
+	backsmalls2 beginfile1 beginfile2 charasbytes commas clos1way6 concat4 \
 	dfamb1 double1 double2 errno fmttest forcenum getlndir gsubtst5 \
-	ignrcas2 inf-nan-torture iolint lc_num1 localenl mbfw1 mbprintf1 \
+	ignrcas2 inf-nan-torture iolint lc_num1 mbfw1 mbprintf1 \
 	mbprintf2 mbprintf3 mbprintf4 mbprintf5 mbstr1 mbstr2 mtchi18n \
 	nlstringtest nofile nonfatal2 numrange posix_compare printhuge \
 	profile5 rebt8b2 regrange reint2 rri1 sigpipe1 sort1 sortfor \
@@ -832,8 +832,8 @@ profile3:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 profile5:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) --pretty=_$@ -f $@.awk 2> _$@.err
+	@echo $@ $(ZOS_FAIL)
+	@-AWKPATH="$(srcdir)" $(AWK) --pretty=_$@ -f $@.awk 2> _$@.err
 	@cat _$@.err >> _$@ ; rm -f _$@.err
 	@-$(TESTOUTCMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -1209,7 +1209,7 @@ nonfatal1:
 
 # 4/2018: On first call to $(CMP), send to /dev/null even with -s for MinGW.
 nlstringtest::
-	@echo $@
+	@echo $@ $(ZOS_FAIL)
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=FRA_FRA.1252 ; export GAWKLOCALE ; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ > /dev/null ; \
@@ -1235,7 +1235,7 @@ typedregex4:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 iolint:
-	@echo $@
+	@echo $@ $(ZOS_FAIL)
 	@echo hello > 'echo hello'
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -2634,7 +2634,7 @@ clos1way6:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 commas:
-	@echo $@
+	@echo $@ $(ZOS_FAIL)
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
diff --git a/test/ChangeLog b/test/ChangeLog
index 98b5622a..882eecc3 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2021-10-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Gentest: Add check for ZOS_FAIL targets that have to
+	be edited manually.
+	* Makefile.am: Update relevant targets.
+
 2021-09-27         Andrew J. Schorr      <aschorr@telemetry-investments.com>
 
 	* ordchr.awk, ordchr.awk: Add test for ord signedness.
diff --git a/test/Gentests b/test/Gentests
index ada51819..d799c9ea 100755
--- a/test/Gentests
+++ b/test/Gentests
@@ -137,7 +137,7 @@ BEGIN {
 	next
 }
 
-/^[[:alpha:]_][[:alnum:]_]*:/ {
+/^[[:alpha:]_][-[:alnum:]_]*:/ {
 	# remember all targets from Makefile.am
 	sub(/:.*/,"")
 	targets[$0]
@@ -300,6 +300,9 @@ END {
 		for (y in locale_tests[x])
 			if (!(y in targets))
 				printf("WARNING: Locale `%s' target `%s' is missing.\n", x, y) > "/dev/stderr"
+	if ("check_zos" in ENVIRON)
+		for (x in zos_fail)
+			printf "WARNING: check target `%s' for $(ZOS_FAIL).\n", x > "/dev/stderr"
 
 	for (x in files)
 		if (!(x in unused) && \
diff --git a/test/Makefile.am b/test/Makefile.am
index 6ae57c9c..c4943ba9 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1587,9 +1587,9 @@ EXPECTED_FAIL_MINGW = \
 # List of tests that fail on z/OS
 EXPECTED_FAIL_ZOS = \
 	aasort aasorti arraysort asort asorti backbigs1 backsmalls1 \
-	backsmalls2 beginfile1 beginfile2 charasbytes clos1way6 concat4 \
+	backsmalls2 beginfile1 beginfile2 charasbytes commas clos1way6 concat4 \
 	dfamb1 double1 double2 errno fmttest forcenum getlndir gsubtst5 \
-	ignrcas2 inf-nan-torture iolint lc_num1 localenl mbfw1 mbprintf1 \
+	ignrcas2 inf-nan-torture iolint lc_num1 mbfw1 mbprintf1 \
 	mbprintf2 mbprintf3 mbprintf4 mbprintf5 mbstr1 mbstr2 mtchi18n \
 	nlstringtest nofile nonfatal2 numrange posix_compare printhuge \
 	profile5 rebt8b2 regrange reint2 rri1 sigpipe1 sort1 sortfor \
@@ -2085,8 +2085,8 @@ profile3:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 profile5:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) --pretty=_$@ -f $@.awk 2> _$@.err
+	@echo $@ $(ZOS_FAIL)
+	@-AWKPATH="$(srcdir)" $(AWK) --pretty=_$@ -f $@.awk 2> _$@.err
 	@cat _$@.err >> _$@ ; rm -f _$@.err
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2456,7 +2456,7 @@ nonfatal1:
 
 # 4/2018: On first call to $(CMP), send to /dev/null even with -s for MinGW.
 nlstringtest::
-	@echo $@
+	@echo $@ $(ZOS_FAIL)
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; export GAWKLOCALE ; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ > /dev/null ; \
@@ -2484,7 +2484,7 @@ typedregex4:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 iolint:
-	@echo $@
+	@echo $@ $(ZOS_FAIL)
 	@echo hello > 'echo hello'
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
diff --git a/test/Makefile.in b/test/Makefile.in
index dbcd8ed1..96846a87 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1855,9 +1855,9 @@ EXPECTED_FAIL_MINGW = \
 # List of tests that fail on z/OS
 EXPECTED_FAIL_ZOS = \
 	aasort aasorti arraysort asort asorti backbigs1 backsmalls1 \
-	backsmalls2 beginfile1 beginfile2 charasbytes clos1way6 concat4 \
+	backsmalls2 beginfile1 beginfile2 charasbytes commas clos1way6 concat4 \
 	dfamb1 double1 double2 errno fmttest forcenum getlndir gsubtst5 \
-	ignrcas2 inf-nan-torture iolint lc_num1 localenl mbfw1 mbprintf1 \
+	ignrcas2 inf-nan-torture iolint lc_num1 mbfw1 mbprintf1 \
 	mbprintf2 mbprintf3 mbprintf4 mbprintf5 mbstr1 mbstr2 mtchi18n \
 	nlstringtest nofile nonfatal2 numrange posix_compare printhuge \
 	profile5 rebt8b2 regrange reint2 rri1 sigpipe1 sort1 sortfor \
@@ -2539,8 +2539,8 @@ profile3:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 profile5:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) --pretty=_$@ -f $@.awk 2> _$@.err
+	@echo $@ $(ZOS_FAIL)
+	@-AWKPATH="$(srcdir)" $(AWK) --pretty=_$@ -f $@.awk 2> _$@.err
 	@cat _$@.err >> _$@ ; rm -f _$@.err
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
@@ -2907,7 +2907,7 @@ nonfatal1:
 
 # 4/2018: On first call to $(CMP), send to /dev/null even with -s for MinGW.
 nlstringtest::
-	@echo $@
+	@echo $@ $(ZOS_FAIL)
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; export GAWKLOCALE ; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ > /dev/null ; \
@@ -2933,7 +2933,7 @@ typedregex4:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 iolint:
-	@echo $@
+	@echo $@ $(ZOS_FAIL)
 	@echo hello > 'echo hello'
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -4317,7 +4317,7 @@ clos1way6:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 commas:
-	@echo $@
+	@echo $@ $(ZOS_FAIL)
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
diff --git a/test/Maketests b/test/Maketests
index dbe992a3..d8097ba1 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1372,7 +1372,7 @@ clos1way6:
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 commas:
-	@echo $@
+	@echo $@ $(ZOS_FAIL)
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@