aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2018-01-21 21:42:04 +0200
committerArnold D. Robbins <arnold@skeeve.com>2018-01-21 21:42:04 +0200
commit1eb3a5b7d00285195cd3bc8e1798a8cb2ad512ba (patch)
tree07870904e8f0964577715aabbb6a5203ea3fe470
parent2a430757c73dbad29b0e63c3904aa9bdbef27ecf (diff)
parent49194a4b354f7187a6089cb2700f7025db51439a (diff)
downloadegawk-1eb3a5b7d00285195cd3bc8e1798a8cb2ad512ba.tar.gz
egawk-1eb3a5b7d00285195cd3bc8e1798a8cb2ad512ba.tar.bz2
egawk-1eb3a5b7d00285195cd3bc8e1798a8cb2ad512ba.zip
Merge branch 'gawk-4.2-stable'
-rw-r--r--pc/ChangeLog5
-rw-r--r--pc/Makefile.tst2
2 files changed, 6 insertions, 1 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 2276529b..c1fa0924 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-21 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.tst (pty2): Sync against test/Makefile.in.
+ Really for real this time.
+
2018-01-20 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.tst: Sync against test/Makefile.in.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 3e5bacba..c6597b6b 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -1370,7 +1370,7 @@ pty2:
@echo Expect $@ to fail with DJGPP and MinGW.
@-case `uname` in \
*[Oo][Ss]/390*) : ;; \
- *) AWKPATH="$(srcdir)" $(AWK) -f $@.awk | od -c >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
+ *) AWKPATH="$(srcdir)" $(AWK) -f $@.awk | od -c | $(AWK) '{ $$1 = $$1 ; print }' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \
esac
rscompat: