[gawk-diffs] [SCM] gawk branch, gawk-4.0-stable, updated. 439d946a0e936267f7f478b22d0754e882bf7cf0

[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.0-stable has been updated
       via  439d946a0e936267f7f478b22d0754e882bf7cf0 (commit)
      from  5cc7f618cb125b389538db5a75e1f0de33139f9b (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=439d946a0e936267f7f478b22d0754e882bf7cf0

commit 439d946a0e936267f7f478b22d0754e882bf7cf0
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Aug 26 21:42:53 2012 +0300

    Fix charasbytes test for Mac OS X (10.5).

diff --git a/test/ChangeLog b/test/ChangeLog
index 75eb5ec..f88b796 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-26         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (charasbytes): Revise test to canonicalize
+       whitespace. (For Mac OS X 10.5, at least.)
+       * charasbytes.ok: Updated.
+
 2012-08-12         Arnold D. Robbins     <address@hidden>
 
        * Makefile.am (regexprange): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 592cf14..bb61bca 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1474,7 +1474,7 @@ charasbytes:
        @echo $@
        @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
        AWKPATH=$(srcdir) $(AWK) -b -f address@hidden $(srcdir)/address@hidden 
| \
-       od -c -t x1 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       od -c -t x1 | sed -e 's/  */ /g' -e 's/ *$$//' >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 
 # Targets generated for other tests:
diff --git a/test/Makefile.in b/test/Makefile.in
index 5c268a9..91652f0 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1851,7 +1851,7 @@ charasbytes:
        @echo $@
        @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
        AWKPATH=$(srcdir) $(AWK) -b -f address@hidden $(srcdir)/address@hidden 
| \
-       od -c -t x1 >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       od -c -t x1 | sed -e 's/  */ /g' -e 's/ *$$//' >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) $(srcdir)/address@hidden _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
diff --git a/test/charasbytes.ok b/test/charasbytes.ok
index a1702e6..f60f2ab 100644
--- a/test/charasbytes.ok
+++ b/test/charasbytes.ok
@@ -1,3 +1,3 @@
-0000000   Z   Z   Z  \n
-         5a  5a  5a  0a
+0000000 Z Z Z \n
+ 5a 5a 5a 0a
 0000004

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

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


hooks/post-receive
-- 
gawk