diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-01-18 17:54:40 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-01-18 17:54:40 +0200 |
| commit | 5cbfe5bf61e874d4ab94c41140aee1a2175a50a9 (patch) | |
| tree | 18f0b411f593037ebbf0aa0f7697c200edb25997 | |
| parent | 7f4a9474439bf1f8b69290db9b48b63b462f27a4 (diff) | |
| parent | a0d46629f9114a740cf6971a1487de9528ec9cf3 (diff) | |
| download | egawk-5cbfe5bf61e874d4ab94c41140aee1a2175a50a9.tar.gz egawk-5cbfe5bf61e874d4ab94c41140aee1a2175a50a9.tar.bz2 egawk-5cbfe5bf61e874d4ab94c41140aee1a2175a50a9.zip | |
Merge branch 'gawk-4.2-stable'
| -rw-r--r-- | test/ChangeLog | 10 | ||||
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rw-r--r-- | test/pty2.ok | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index abff2dd7..04e7f121 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2018-01-18 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (pty2): Instead of sed, use simpler awk goop + to canonicalize the output from od. Thanks to Michal + Jaegermann for the tip. + * pty2.ok: Updated. + 2018-01-17 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (charset-tests-all): Add punctuation in the message. @@ -5,6 +12,9 @@ reformat the message. (isarrayunset): New test. * isarrayunset.awk, isarrayunset.ok: New files. + * pty2: Add some sed goop to canonicalize the output of od; + this works around the Mac OS X od which produces different + output, avoiding a spurious test failure. 2018-01-15 Arnold D. Robbins <arnold@skeeve.com> diff --git a/test/Makefile.am b/test/Makefile.am index 34d90782..1ef52600 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2416,11 +2416,13 @@ pty1: $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \ esac +## 1/2018: The awk goop is to compensate for different output of od on +## Mac OS X systems. Sigh. pty2: @echo $@ @-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 diff --git a/test/Makefile.in b/test/Makefile.in index f8b6e05d..aa0d7655 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2858,7 +2858,7 @@ pty2: @echo $@ @-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 diff --git a/test/pty2.ok b/test/pty2.ok index fb0f6221..0c8afd98 100644 --- a/test/pty2.ok +++ b/test/pty2.ok @@ -1,2 +1,2 @@ -0000000 a b c d \n +0000000 a b c d \n 0000005 |