From 03071bb40bcf57e0b6d42829c9f94b600e49a090 Mon Sep 17 00:00:00 2001
From: "Arnold D. Robbins" <arnold@skeeve.com>
Date: Tue, 19 Jul 2016 20:15:31 +0300
Subject: Attempt to fix clos1way6 test on 32 bit Solaris.

---
 test/ChangeLog     |  7 +++++++
 test/Makefile.am   |  6 ++++++
 test/Makefile.in   | 11 ++++++-----
 test/Maketests     |  5 -----
 test/clos1way6.ok2 |  3 +++
 5 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 test/clos1way6.ok2

diff --git a/test/ChangeLog b/test/ChangeLog
index 8b4d70e8..ac9528d2 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-03         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* Makefile.am (rebuild): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 3a51b3ff..71e21411 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -163,6 +163,7 @@ EXTRA_DIST = \
 	clos1way5.ok \
 	clos1way6.awk \
 	clos1way6.ok \
+	clos1way6.ok2 \
 	closebad.awk \
 	closebad.ok \
 	clsflnam.awk \
@@ -2316,6 +2317,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 29064326..cfbc1a83 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -420,6 +420,7 @@ EXTRA_DIST = \
 	clos1way5.ok \
 	clos1way6.awk \
 	clos1way6.ok \
+	clos1way6.ok2 \
 	closebad.awk \
 	closebad.ok \
 	clsflnam.awk \
@@ -2753,6 +2754,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:
@@ -3817,11 +3823,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 525a44d1..c43db835 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1062,11 +1062,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
-- 
cgit v1.2.3