aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2018-01-21 21:42:37 +0200
committerArnold D. Robbins <arnold@skeeve.com>2018-01-21 21:42:37 +0200
commit27c4a44456fa4dbd4229c9ec92e7e2b39493a188 (patch)
treef3179af19b2a6dba34c2e49bf7f9f835e77e8beb
parent889b4363d9aa51ba469bbea3aed2db83feda21e3 (diff)
parent1eb3a5b7d00285195cd3bc8e1798a8cb2ad512ba (diff)
downloadegawk-27c4a44456fa4dbd4229c9ec92e7e2b39493a188.tar.gz
egawk-27c4a44456fa4dbd4229c9ec92e7e2b39493a188.tar.bz2
egawk-27c4a44456fa4dbd4229c9ec92e7e2b39493a188.zip
Merge branch 'master' into feature/fix-comments
-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: