aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/ChangeLog7
-rw-r--r--test/Makefile.am6
-rw-r--r--test/Makefile.in11
-rw-r--r--test/Maketests5
-rw-r--r--test/clos1way6.ok23
5 files changed, 22 insertions, 10 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index c585120a..20c0ea00 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2016-07-19 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (clos1way6): Add additional file to check result
+ against for 32 bit Solaris. Thanks to Dagobert Michelsen for
+ the report.
+ * clos1way6.ok2: New file.
+
2016-07-08 Andrew J. Schorr <aschorr@telemetry-investments.com>
* Makefile.am (apiterm, fldterm): New tests to make sure that we
diff --git a/test/Makefile.am b/test/Makefile.am
index f884ba34..3b670f81 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -168,6 +168,7 @@ EXTRA_DIST = \
clos1way5.ok \
clos1way6.awk \
clos1way6.ok \
+ clos1way6.ok2 \
closebad.awk \
closebad.ok \
clsflnam.awk \
@@ -2324,6 +2325,11 @@ symtab10:
@AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < "$(srcdir)/$@.in" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+clos1way6:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-($(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@) || ($(CMP) "$(srcdir)"/$@.ok2 _$@ && rm -f _$@)
+
# Targets generated for other tests:
include Maketests
diff --git a/test/Makefile.in b/test/Makefile.in
index 45593f15..5885c1e6 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -425,6 +425,7 @@ EXTRA_DIST = \
clos1way5.ok \
clos1way6.awk \
clos1way6.ok \
+ clos1way6.ok2 \
closebad.awk \
closebad.ok \
clsflnam.awk \
@@ -2761,6 +2762,11 @@ symtab10:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk < "$(srcdir)/$@.in" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+clos1way6:
+ @echo $@
+ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+ @-($(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@) || ($(CMP) "$(srcdir)"/$@.ok2 _$@ && rm -f _$@)
Gt-dummy:
# file Maketests, generated from Makefile.am by the Gentests program
addcomma:
@@ -3835,11 +3841,6 @@ clos1way5:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-clos1way6:
- @echo $@
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
crlf:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 4c85c44a..606e49b9 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1072,11 +1072,6 @@ clos1way5:
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-clos1way6:
- @echo $@
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
crlf:
@echo $@
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/clos1way6.ok2 b/test/clos1way6.ok2
new file mode 100644
index 00000000..e49cb152
--- /dev/null
+++ b/test/clos1way6.ok2
@@ -0,0 +1,3 @@
+gawk: clos1way6.awk:5: warning: fflush: cannot flush: two-way pipe `cat - 1>&2; sleep 2' has closed write end
+test1
+Bad file number