aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2013-11-03 22:10:05 +0200
committerArnold D. Robbins <arnold@skeeve.com>2013-11-03 22:10:05 +0200
commit85c5ac3687abb33e2960dfc8d6eeedf7242494f5 (patch)
treec3bba88ef52be697f7b3b6d6838fb0c30a4a3da7
parente63fcbb536b4346622a9d8a7421a83e65c0f8de2 (diff)
downloadegawk-85c5ac3687abb33e2960dfc8d6eeedf7242494f5.tar.gz
egawk-85c5ac3687abb33e2960dfc8d6eeedf7242494f5.tar.bz2
egawk-85c5ac3687abb33e2960dfc8d6eeedf7242494f5.zip
Make pipeio3 test work on PPC Mac OS X.
-rw-r--r--test/ChangeLog3
-rw-r--r--test/Makefile.am3
-rw-r--r--test/Makefile.in3
-rw-r--r--test/pipeio3.ok24
4 files changed, 11 insertions, 2 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index e931c4fb..bec7175b 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,7 +1,10 @@
2013-11-03 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (backsmalls2): New test.
+ (pipeio3): Check results against pipeio3.ok2 if
+ the first check fails.
* backsmalls2.awk, backsmalls2.ok: New files.
+ * pipeio3.ok2: New file. This is the results on PPC Mac OS X.
2013-10-30 Arnold D. Robbins <arnold@skeeve.com>
diff --git a/test/Makefile.am b/test/Makefile.am
index 09ed3cca..26734173 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -657,6 +657,7 @@ EXTRA_DIST = \
pipeio2.ok \
pipeio3.awk \
pipeio3.ok \
+ pipeio3.ok2 \
posix.awk \
posix.in \
posix.ok \
@@ -1893,7 +1894,7 @@ 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 _$@ && rm -f _$@
+ @-$(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 c969ef74..9601241f 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -875,6 +875,7 @@ EXTRA_DIST = \
pipeio2.ok \
pipeio3.awk \
pipeio3.ok \
+ pipeio3.ok2 \
posix.awk \
posix.in \
posix.ok \
@@ -2288,7 +2289,7 @@ 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 _$@ && rm -f _$@
+ @-$(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.ok2 b/test/pipeio3.ok2
new file mode 100644
index 00000000..25d26293
--- /dev/null
+++ b/test/pipeio3.ok2
@@ -0,0 +1,4 @@
+doing first print
+sh: 1: cart: not found
+gawk: pipeio3.awk:6: fatal: print to "cart" failed (Broken pipe)
+EXIT CODE: 2