[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-2766-g4b6c350

[Andrew J. Schorr]

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, master has been updated
       via  4b6c3509f6eb3a947606d220b3e33dd995a934c4 (commit)
      from  45b363502f438604737f19b639f7dc1433a022f2 (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=4b6c3509f6eb3a947606d220b3e33dd995a934c4

commit 4b6c3509f6eb3a947606d220b3e33dd995a934c4
Author: Andrew J. Schorr <address@hidden>
Date:   Thu Sep 14 08:18:09 2017 -0400

    Fix nonfatal1 test by ignoring the platform-specific portion of the error 
message.

diff --git a/test/ChangeLog b/test/ChangeLog
index 29b4181..16708f4 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,10 @@
+2017-09-14         Andrew J. Schorr     <address@hidden>
+
+       * Makefile.am (nonfatal1): New rule with postprocessing to remove
+       the platform-specific portion of the error message.
+       * nonfatal1.ok: Remove the platform-specific portion of the error
+       message.
+
 2017-09-12         Arnold D. Robbins     <address@hidden>
 
        * Makefile.am (readdir): Add to message that test can fail on
diff --git a/test/Makefile.am b/test/Makefile.am
index 7976fcd..1ef33b1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2424,6 +2424,11 @@ sourcesplit:
        @AWKPATH="$(srcdir)" $(AWK) --source='BEGIN { a = 5;' --source='print a 
}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+nonfatal1:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 2>&1 | $(AWK) '{print 
gensub(/invalid:.*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 # Targets generated for other tests:
 include Maketests
 
diff --git a/test/Makefile.in b/test/Makefile.in
index abb3b34..bf91f16 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2861,6 +2861,11 @@ sourcesplit:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) --source='BEGIN { a = 5;' --source='print a 
}' >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+nonfatal1:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 2>&1 | $(AWK) '{print 
gensub(/invalid:.*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
@@ -4245,11 +4250,6 @@ nondec:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-nonfatal1:
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 nonfatal2:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index e6a2f30..8ae3f97 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1382,11 +1382,6 @@ nondec:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-nonfatal1:
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 nonfatal2:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/nonfatal1.ok b/test/nonfatal1.ok
index 4c9ab57..51583f2 100644
--- a/test/nonfatal1.ok
+++ b/test/nonfatal1.ok
@@ -1,2 +1,2 @@
-gawk: nonfatal1.awk:4: warning: remote host and port information (local:host, 
25) invalid: Name or service not known
+gawk: nonfatal1.awk:4: warning: remote host and port information (local:host, 
25) invalid
 1

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

Summary of changes:
 test/ChangeLog    |  7 +++++++
 test/Makefile.am  |  5 +++++
 test/Makefile.in  | 10 +++++-----
 test/Maketests    |  5 -----
 test/nonfatal1.ok |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
gawk