[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-550-g16d6377

[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.1-stable has been updated
       via  16d6377af8d1683a29b9dc7d7ab3e8d4bc1ebd48 (commit)
      from  0e829ea9a5062cac730f5a8368ab2062c1ef67fd (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=16d6377af8d1683a29b9dc7d7ab3e8d4bc1ebd48

commit 16d6377af8d1683a29b9dc7d7ab3e8d4bc1ebd48
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Jan 14 20:50:00 2015 +0200

    Fix dumpvars test after removing deferred variables.

diff --git a/test/ChangeLog b/test/ChangeLog
index 16ef6d5..04e65b5 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,5 +1,7 @@
 2015-01-14         Arnold D. Robbins     <address@hidden>
 
+       * Makefile.am (dumpvars): Grep out ENVIRON and PROCINFO since
+       those can be different depending on who runs the test.
        * dumpvars.ok, id.ok: Updated after code changes.
 
 2015-01-07         Arnold D. Robbins     <address@hidden>
diff --git a/test/Makefile.am b/test/Makefile.am
index 12bde88..bd2903a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1679,7 +1679,7 @@ beginfile2:
 dumpvars::
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) --dump-variables 1 < 
"$(srcdir)"/address@hidden >/dev/null 2>&1 || echo EXIT CODE: $$? >>_$@
-       @mv awkvars.out _$@
+       @grep -v ENVIRON < awkvars.out | grep -v PROCINFO > _$@; rm awkvars.out
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 profile1:
diff --git a/test/Makefile.in b/test/Makefile.in
index 55650e1..e01e273 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2105,7 +2105,7 @@ beginfile2:
 dumpvars::
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) --dump-variables 1 < 
"$(srcdir)"/address@hidden >/dev/null 2>&1 || echo EXIT CODE: $$? >>_$@
-       @mv awkvars.out _$@
+       @grep -v ENVIRON < awkvars.out | grep -v PROCINFO > _$@; rm awkvars.out
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 profile1:
diff --git a/test/dumpvars.ok b/test/dumpvars.ok
index 5013b35..73d3d30 100644
--- a/test/dumpvars.ok
+++ b/test/dumpvars.ok
@@ -3,7 +3,6 @@ ARGIND: 0
 ARGV: array, 1 elements
 BINMODE: 0
 CONVFMT: "%.6g"
-ENVIRON: array, 57 elements
 ERRNO: ""
 FIELDWIDTHS: ""
 FILENAME: "-"
@@ -18,7 +17,6 @@ OFMT: "%.6g"
 OFS: " "
 ORS: "\n"
 PREC: 53
-PROCINFO: array, 28 elements
 RLENGTH: 0
 ROUNDMODE: "N"
 RS: "\n"

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

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


hooks/post-receive
-- 
gawk