[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-2890-ga0d4662

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-4.2-stable has been updated
       via  a0d46629f9114a740cf6971a1487de9528ec9cf3 (commit)
      from  980c1fb130eb4df4fab4bd08ae782fadaa39ebcd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=a0d46629f9114a740cf6971a1487de9528ec9cf3

commit a0d46629f9114a740cf6971a1487de9528ec9cf3
Author: Arnold D. Robbins <address@hidden>
Date:   Thu Jan 18 17:54:15 2018 +0200

    Improve pty2 test.

diff --git a/test/ChangeLog b/test/ChangeLog
index ec8e42c..04e7f12 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2018-01-18         Arnold D. Robbins     <address@hidden>
+
+       * 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     <address@hidden>
 
        * Makefile.am (charset-tests-all): Add punctuation in the message.
diff --git a/test/Makefile.am b/test/Makefile.am
index 8090046..1ef5260 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2416,13 +2416,13 @@ pty1:
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ;; \
        esac
 
-## 1/2018: The sed goop is to compensate for different output of od on
+## 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 address@hidden | od -c | sed -e 's/0  
*/0   /' -e 's/  *$$//' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
+       *) AWKPATH="$(srcdir)" $(AWK) -f address@hidden | od -c | $(AWK) '{ $$1 
= $$1 ; print }' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ;; \
        esac
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 13fe1c3..aa0d765 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 address@hidden | od -c | sed -e 's/0  
*/0   /' -e 's/  *$$//' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
+       *) AWKPATH="$(srcdir)" $(AWK) -f address@hidden | od -c | $(AWK) '{ $$1 
= $$1 ; print }' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ;; \
        esac
 
diff --git a/test/pty2.ok b/test/pty2.ok
index fb0f622..0c8afd9 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

-----------------------------------------------------------------------

Summary of changes:
 test/ChangeLog   | 7 +++++++
 test/Makefile.am | 4 ++--
 test/Makefile.in | 2 +-
 test/pty2.ok     | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
gawk