12 files changed, 44 insertions, 19 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index bdf78acd..65c60388 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,18 @@
+2016-04-11         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* clos1way2.ok, clos1way3.ok, clos1way4.ok, clos1way5.ok: Update
+	after Eli's code changes.
+	* Makefile.am (pty1): Disable test on z/OS.
+
+2016-04-08  Eli Zaretskii  <eliz@gnu.org>
+
+	* clos1way2.awk:
+	* clos1way3.awk:
+	* clos1way4.awk:
+	* clos1way5.awk: Use "&&" instead of ";" to chain commands, so
+	that it works with stock MS-Windows shells as well.
+	* clos1way2.ok: Adjust the error message to the change in command.
+
 2016-04-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* watchpoint1: Use $(srcdir) on input file so out-of-tree
diff --git a/test/Makefile.am b/test/Makefile.am
index 8a5b669e..b0b24b7d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2224,6 +2224,14 @@ watchpoint1:
 	@AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk $(srcdir)/$@.in < $(srcdir)/$@.script >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+pty1:
+	@echo $@
+	@case `uname` in \
+	openedition*) : ;; \
+	*) AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
+	$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \
+	esac
+
 # Targets generated for other tests:
 include Maketests
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 1e9b1bd8..8eaa7299 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2661,6 +2661,14 @@ watchpoint1:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk $(srcdir)/$@.in < $(srcdir)/$@.script >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+pty1:
+	@echo $@
+	@case `uname` in \
+	openedition*) : ;; \
+	*) AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
+	$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \
+	esac
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
@@ -3940,11 +3948,6 @@ procinfs:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-pty1:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 regnul1:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 3b4691d2..d10c2e45 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1277,11 +1277,6 @@ procinfs:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-pty1:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 regnul1:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/clos1way2.awk b/test/clos1way2.awk
index 5794bec5..c734c142 100644
--- a/test/clos1way2.awk
+++ b/test/clos1way2.awk
@@ -1,5 +1,6 @@
 {
-	cmd = "cat - 1>&2; sleep 2"
+	# We use "&&" and not ";" so it works with Windows shells as well.
+	cmd = "cat - 1>&2 && sleep 2"
 	print |& cmd; close(cmd, "to")
 	fflush(cmd)
 	print |& cmd; print ERRNO
diff --git a/test/clos1way2.ok b/test/clos1way2.ok
index 67240ac9..c13a79c3 100644
--- a/test/clos1way2.ok
+++ b/test/clos1way2.ok
@@ -1,4 +1,4 @@
-gawk: clos1way2.awk:4: (FILENAME=- FNR=1) warning: fflush: cannot flush: two-way pipe `cat - 1>&2; sleep 2' has closed write end
+gawk: clos1way2.awk:5: (FILENAME=- FNR=1) warning: fflush: cannot flush: two-way pipe `cat - 1>&2 && sleep 2' has closed write end
 test
-gawk: clos1way2.awk:5: (FILENAME=- FNR=1) fatal: print: attempt to write to closed write end of two-way pipe
+gawk: clos1way2.awk:6: (FILENAME=- FNR=1) fatal: print: attempt to write to closed write end of two-way pipe
 EXIT CODE: 2
diff --git a/test/clos1way3.awk b/test/clos1way3.awk
index f69f6675..2c4a6f4f 100644
--- a/test/clos1way3.awk
+++ b/test/clos1way3.awk
@@ -1,5 +1,6 @@
 BEGIN {
-	cmd = "cat - 1>&2; sleep 2"
+	# We use "&&" and not ";" so it works with Windows shells as well.
+	cmd = "cat - 1>&2 && sleep 2"
 	print "test1" |& cmd
 	close(cmd, "to")
 	print "test2" |& cmd
diff --git a/test/clos1way3.ok b/test/clos1way3.ok
index b0157fa1..6677fdf0 100644
--- a/test/clos1way3.ok
+++ b/test/clos1way3.ok
@@ -1,3 +1,3 @@
 test1
-gawk: clos1way3.awk:5: fatal: print: attempt to write to closed write end of two-way pipe
+gawk: clos1way3.awk:6: fatal: print: attempt to write to closed write end of two-way pipe
 EXIT CODE: 2
diff --git a/test/clos1way4.awk b/test/clos1way4.awk
index 6c68c5c8..106e4467 100644
--- a/test/clos1way4.awk
+++ b/test/clos1way4.awk
@@ -1,5 +1,6 @@
 BEGIN {
-	cmd = "cat - 1>&2; sleep 2"
+	# We use "&&" and not ";" so it works with Windows shells as well.
+	cmd = "cat - 1>&2 && sleep 2"
 	printf "%s\n", "test1" |& cmd
 	close(cmd, "to")
 	printf "%s\n", "test2" |& cmd
diff --git a/test/clos1way4.ok b/test/clos1way4.ok
index e30aa7f6..132a4b95 100644
--- a/test/clos1way4.ok
+++ b/test/clos1way4.ok
@@ -1,3 +1,3 @@
 test1
-gawk: clos1way4.awk:5: fatal: printf: attempt to write to closed write end of two-way pipe
+gawk: clos1way4.awk:6: fatal: printf: attempt to write to closed write end of two-way pipe
 EXIT CODE: 2
diff --git a/test/clos1way5.awk b/test/clos1way5.awk
index ca1bd94c..0af19093 100644
--- a/test/clos1way5.awk
+++ b/test/clos1way5.awk
@@ -1,5 +1,6 @@
 BEGIN {
-	cmd = "echo test1; echo test2; sleep 2"
+	# We use "&&" and not ";" so it works with Windows shells as well.
+	cmd = "echo test1&& echo test2&& sleep 2"
 	cmd |& getline x
 	print x
 	close(cmd, "from")
diff --git a/test/clos1way5.ok b/test/clos1way5.ok
index 1ff15402..58205982 100644
--- a/test/clos1way5.ok
+++ b/test/clos1way5.ok
@@ -1,3 +1,3 @@
 test1
-gawk: clos1way5.awk:6: fatal: getline: attempt to read from closed read end of two-way pipe
+gawk: clos1way5.awk:7: fatal: getline: attempt to read from closed read end of two-way pipe
 EXIT CODE: 2