diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-01-14 20:51:00 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-01-14 20:51:00 +0200 |
| commit | c6cc60329c5bfc6c181cc45b09f30ac8a8a20b49 (patch) | |
| tree | 9850c7b98412694867a5645671a34359fe081b6f | |
| parent | 976be25f6d3ea05f658a43abee336fe7e3bd419d (diff) | |
| parent | 16d6377af8d1683a29b9dc7d7ab3e8d4bc1ebd48 (diff) | |
| download | gawk-c6cc60329c5bfc6c181cc45b09f30ac8a8a20b49.tar.gz | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | test/ChangeLog | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rw-r--r-- | test/dumpvars.ok | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index a81e9f43..500fdb02 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,5 +1,7 @@ 2015-01-14 Arnold D. Robbins <arnold@skeeve.com> + * 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 <arnold@skeeve.com> diff --git a/test/Makefile.am b/test/Makefile.am index 11b7d000..c3d8309d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1681,7 +1681,7 @@ beginfile2: dumpvars:: @echo $@ @AWKPATH="$(srcdir)" $(AWK) --dump-variables 1 < "$(srcdir)"/$@.in >/dev/null 2>&1 || echo EXIT CODE: $$? >>_$@ - @mv awkvars.out _$@ + @grep -v ENVIRON < awkvars.out | grep -v PROCINFO > _$@; rm awkvars.out @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ profile1: diff --git a/test/Makefile.in b/test/Makefile.in index 902bfe63..3c036351 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2107,7 +2107,7 @@ beginfile2: dumpvars:: @echo $@ @AWKPATH="$(srcdir)" $(AWK) --dump-variables 1 < "$(srcdir)"/$@.in >/dev/null 2>&1 || echo EXIT CODE: $$? >>_$@ - @mv awkvars.out _$@ + @grep -v ENVIRON < awkvars.out | grep -v PROCINFO > _$@; rm awkvars.out @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ profile1: diff --git a/test/dumpvars.ok b/test/dumpvars.ok index 5013b351..73d3d306 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" |