Merge branch 'master' into feature/bwk-csv

6 files changed, 38 insertions, 14 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index cbf998ba..25aa0fef 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2022-10-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (EXTRA_DIST): New test: divzero2.
+	* divzero2.awk, divzero2.ok: New files.
+
 2022-10-14         Andrew J. Schorr      <aschorr@telemetry-investments.com>
 
 	* Makefile.am (readall): Capture stderr from the programs also.
diff --git a/test/Makefile.am b/test/Makefile.am
index d1adfe1c..6efc266e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -279,6 +279,8 @@ EXTRA_DIST = \
 	dfastress.ok \
 	divzero.awk \
 	divzero.ok \
+	divzero2.awk \
+	divzero2.ok \
 	double1.awk \
 	double1.ok \
 	double2.awk \
@@ -1455,7 +1457,8 @@ BASIC_TESTS = \
 	back89 backgsub badassign1 badbuild callparam childin clobber \
 	closebad close_status clsflnam compare compare2 concat1 concat2 \
 	concat3 concat4 concat5 convfmt datanonl defref delargv delarpm2 \
-	delarprm delfunc dfacheck2 dfamb1 dfastress divzero dynlj eofsplit \
+	delarprm delfunc dfacheck2 dfamb1 dfastress divzero divzero2 \
+	dynlj eofsplit \
 	eofsrc1 escapebrace exit2 exitval1 exitval2 exitval3 fcall_exit \
 	fcall_exit2 fldchg fldchgnf fldterm fnamedat fnarray fnarray2 \
 	fnaryscl fnasgnm fnmisc fordel forref forsimp fsbs fscaret fsnul1 \
diff --git a/test/Makefile.in b/test/Makefile.in
index 21e5eb68..398ea05d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -114,16 +114,16 @@ subdir = test
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/arch.m4 \
 	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lcmessage.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libsigsegv.m4 \
-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/mpfr.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/noreturn.m4 \
-	$(top_srcdir)/m4/pma.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
-	$(top_srcdir)/m4/socket.m4 \
+	$(top_srcdir)/m4/c-bool.m4 $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/host-cpu-c-abi.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libsigsegv.m4 $(top_srcdir)/m4/longlong.m4 \
+	$(top_srcdir)/m4/mpfr.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/noreturn.m4 $(top_srcdir)/m4/pma.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/readline.m4 $(top_srcdir)/m4/socket.m4 \
 	$(top_srcdir)/m4/triplet-transformation.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -547,6 +547,8 @@ EXTRA_DIST = \
 	dfastress.ok \
 	divzero.awk \
 	divzero.ok \
+	divzero2.awk \
+	divzero2.ok \
 	double1.awk \
 	double1.ok \
 	double2.awk \
@@ -1723,7 +1725,8 @@ BASIC_TESTS = \
 	back89 backgsub badassign1 badbuild callparam childin clobber \
 	closebad close_status clsflnam compare compare2 concat1 concat2 \
 	concat3 concat4 concat5 convfmt datanonl defref delargv delarpm2 \
-	delarprm delfunc dfacheck2 dfamb1 dfastress divzero dynlj eofsplit \
+	delarprm delfunc dfacheck2 dfamb1 dfastress divzero divzero2 \
+	dynlj eofsplit \
 	eofsrc1 escapebrace exit2 exitval1 exitval2 exitval3 fcall_exit \
 	fcall_exit2 fldchg fldchgnf fldterm fnamedat fnarray fnarray2 \
 	fnaryscl fnasgnm fnmisc fordel forref forsimp fsbs fscaret fsnul1 \
@@ -2875,8 +2878,8 @@ readdir_retest:
 
 readall:
 	@echo $@
-	@-AWKPATH="$(srcdir)" $(AWK) -lrwarray -f $@1.awk -v "ofile=readall.state" > _$@
-	@-AWKPATH="$(srcdir)" $(AWK) -lrwarray -f $@2.awk -v "ifile=readall.state" >> _$@
+	@-AWKPATH="$(srcdir)" $(AWK) -lrwarray -f $@1.awk -v "ofile=readall.state" > _$@ 2>&1
+	@-AWKPATH="$(srcdir)" $(AWK) -lrwarray -f $@2.awk -v "ifile=readall.state" >> _$@ 2>&1
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 	@-$(RM) -f readall.state
 
@@ -3343,6 +3346,11 @@ divzero:
 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+divzero2:
+	@echo $@
+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 dynlj:
 	@echo $@
 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 64fe3cc5..16ea147c 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -282,6 +282,11 @@ divzero:
 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+divzero2:
+	@echo $@
+	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 dynlj:
 	@echo $@
 	@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/divzero2.awk b/test/divzero2.awk
new file mode 100644
index 00000000..ffe449d5
--- /dev/null
+++ b/test/divzero2.awk
@@ -0,0 +1,2 @@
+# This program should NOT print error division by zero.
+BEGIN { print "2" / "3" }
diff --git a/test/divzero2.ok b/test/divzero2.ok
new file mode 100644
index 00000000..6d0430ff
--- /dev/null
+++ b/test/divzero2.ok
@@ -0,0 +1 @@
+0.666667