Merge branch 'gawk-4.1-stable'

6 files changed, 8 insertions, 45 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 4bead8c7..3a115112 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-29         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (pipeio3): Removed test and reference to files.
+	It was too ful of race conditions to work reliably everywhere.
+	* pipeio3.awk, pipeio3.ok, pipeio3.ok2: Removed.
+
 2013-11-28         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* readdir0.awk: Take argument which is directory to read.
diff --git a/test/Makefile.am b/test/Makefile.am
index 5133e134..a4f14f18 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -655,9 +655,6 @@ EXTRA_DIST = \
 	pipeio2.awk \
 	pipeio2.in \
 	pipeio2.ok \
-	pipeio3.awk \
-	pipeio3.ok \
-	pipeio3.ok2 \
 	posix.awk \
 	posix.in \
 	posix.ok \
@@ -979,7 +976,7 @@ BASIC_TESTS = \
 	zero2 zeroe0 zeroflag
 
 UNIX_TESTS = \
-	fflush getlnhd localenl pid pipeio1 pipeio2 pipeio3 poundbang \
+	fflush getlnhd localenl pid pipeio1 pipeio2 poundbang \
 	rtlen rtlen01 space strftlng
 
 GAWK_EXT_TESTS = \
@@ -1898,12 +1895,6 @@ backsmalls2:
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-pipeio3:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@sed 's/.*sh.*cart:.*not found/sh: 1: cart: not found/' < _$@ >_x$@ ; mv _x$@ _$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ || $(CMP) "$(srcdir)"/$@.ok2 _$@ && rm -f _$@
-
 # Targets generated for other tests:
 include Maketests
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 256ca484..2e656a42 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -873,9 +873,6 @@ EXTRA_DIST = \
 	pipeio2.awk \
 	pipeio2.in \
 	pipeio2.ok \
-	pipeio3.awk \
-	pipeio3.ok \
-	pipeio3.ok2 \
 	posix.awk \
 	posix.in \
 	posix.ok \
@@ -1196,7 +1193,7 @@ BASIC_TESTS = \
 	zero2 zeroe0 zeroflag
 
 UNIX_TESTS = \
-	fflush getlnhd localenl pid pipeio1 pipeio2 pipeio3 poundbang \
+	fflush getlnhd localenl pid pipeio1 pipeio2 poundbang \
 	rtlen rtlen01 space strftlng
 
 GAWK_EXT_TESTS = \
@@ -2291,12 +2288,6 @@ backsmalls2:
 	@[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
 	AWKPATH="$(srcdir)" $(AWK) -f $@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
-pipeio3:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@sed 's/.*sh.*cart:.*not found/sh: 1: cart: not found/' < _$@ >_x$@ ; mv _x$@ _$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ || $(CMP) "$(srcdir)"/$@.ok2 _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
diff --git a/test/pipeio3.awk b/test/pipeio3.awk
deleted file mode 100644
index a1cd3743..00000000
--- a/test/pipeio3.awk
+++ /dev/null
@@ -1,15 +0,0 @@
-BEGIN {
-	outputCommand = "cart"
-	inputCommand = "ls"
-
-	print "doing first print" > "/dev/stderr"
-	print "hello" | outputCommand
-
-	print "doing first getline" > "/dev/stderr"
-	inputCommand | getline
-
-	print "doing second print" > "/dev/stderr"
-	print "hello" | outputCommand
-
-	print "made it here" > "/dev/stderr"
-}
diff --git a/test/pipeio3.ok b/test/pipeio3.ok
deleted file mode 100644
index 17a08e9c..00000000
--- a/test/pipeio3.ok
+++ /dev/null
@@ -1,6 +0,0 @@
-doing first print
-doing first getline
-sh: 1: cart: not found
-doing second print
-gawk: pipeio3.awk:12: fatal: print to "cart" failed (Broken pipe)
-EXIT CODE: 2
diff --git a/test/pipeio3.ok2 b/test/pipeio3.ok2
deleted file mode 100644
index 25d26293..00000000
--- a/test/pipeio3.ok2
+++ /dev/null
@@ -1,4 +0,0 @@
-doing first print
-sh: 1: cart: not found
-gawk: pipeio3.awk:6: fatal: print to "cart" failed (Broken pipe)
-EXIT CODE: 2