[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-2889-g980c1fb

[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  980c1fb130eb4df4fab4bd08ae782fadaa39ebcd (commit)
      from  8c26b0480d3f83416e6791a0453e3548e139a00f (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=980c1fb130eb4df4fab4bd08ae782fadaa39ebcd

commit 980c1fb130eb4df4fab4bd08ae782fadaa39ebcd
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Jan 17 21:33:22 2018 +0200

    Fix pty2 test for Mac OS X.

diff --git a/test/ChangeLog b/test/ChangeLog
index abff2dd..ec8e42c 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -5,6 +5,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     <address@hidden>
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 34d9078..8090046 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2416,11 +2416,13 @@ pty1:
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ;; \
        esac
 
+## 1/2018: The sed 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  >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@ ; \
+       *) AWKPATH="$(srcdir)" $(AWK) -f address@hidden | od -c | sed -e 's/0  
*/0   /' -e 's/  *$$//' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ;; \
        esac
 
diff --git a/test/Makefile.in b/test/Makefile.in
index f8b6e05..13fe1c3 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  >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@ ; \
+       *) AWKPATH="$(srcdir)" $(AWK) -f address@hidden | od -c | sed -e 's/0  
*/0   /' -e 's/  *$$//' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \
        $(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@ ;; \
        esac
 

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

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


hooks/post-receive
-- 
gawk