aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/ChangeLog6
-rw-r--r--test/Makefile.am6
-rw-r--r--test/Makefile.in11
-rw-r--r--test/Maketests5
-rw-r--r--test/profile5.ok4
5 files changed, 22 insertions, 10 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 7ab83841..dda9c30a 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2020-02-09 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (profile5): Append results of stderr to the
+ test output. Thanks to John Malmberg for the report.
+ * profile5.ok: Updated.
+
2020-01-26 Arnold D. Robbins <arnold@skeeve.com>
* functab4.awk: Code changes to avoid race conditions
diff --git a/test/Makefile.am b/test/Makefile.am
index aee2ddd5..3eef78ce 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2017,6 +2017,12 @@ profile3:
@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+profile5:
+ @echo $@
+ @$(AWK) --pretty=_$@ -f "$(srcdir)"/$@.awk 2> _$@.err
+ @cat _$@.err >> _$@ ; rm -f _$@.err
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
profile6:
@echo $@
@$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
diff --git a/test/Makefile.in b/test/Makefile.in
index 9c91126b..29bb9bcc 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2466,6 +2466,12 @@ profile3:
@sed 1,2d < ap-$@.out > _$@; rm ap-$@.out
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+profile5:
+ @echo $@
+ @$(AWK) --pretty=_$@ -f "$(srcdir)"/$@.awk 2> _$@.err
+ @cat _$@.err >> _$@ ; rm -f _$@.err
+ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
profile6:
@echo $@
@$(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null
@@ -4636,11 +4642,6 @@ profile4:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-profile5:
- @echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
profile8:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index e6e3ee53..30b3ad5c 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1785,11 +1785,6 @@ profile4:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-profile5:
- @echo $@ $(ZOS_FAIL)
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
profile8:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/profile5.ok b/test/profile5.ok
index 309ec1e4..588d2c02 100644
--- a/test/profile5.ok
+++ b/test/profile5.ok
@@ -8176,3 +8176,7 @@ function zzer()
{
################################################################
}
+gawk: ./profile5.awk:3278: warning: regexp escape sequence `\~' is not a known regexp operator
+gawk: ./profile5.awk:3601: warning: regexp escape sequence `\!' is not a known regexp operator
+gawk: ./profile5.awk:3610: warning: regexp escape sequence `\:' is not a known regexp operator
+gawk: ./profile5.awk:3742: warning: regexp escape sequence `\,' is not a known regexp operator