[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-1911-g8b26bcd

[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, master has been updated
       via  8b26bcdbf03e3effd6715f807adff04c4dfce400 (commit)
      from  03071bb40bcf57e0b6d42829c9f94b600e49a090 (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=8b26bcdbf03e3effd6715f807adff04c4dfce400

commit 8b26bcdbf03e3effd6715f807adff04c4dfce400
Author: Arnold D. Robbins <address@hidden>
Date:   Wed Jul 20 21:46:31 2016 +0300

    Improve clos1way6 test for Solaris 32 bit systems.

diff --git a/test/ChangeLog b/test/ChangeLog
index ac9528d..7d800fb 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,12 @@
+2016-07-20         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (EXTRA_DIST): Remove clos1way6.ok2.
+       (close1way6): Removed test, it will be autogenerated back into
+       the right place.
+       * clos1way6.awk: Use gensub on ERRNO to force the right text.
+       Thanks to Andrew Schorr for the suggestion.
+       * clos1way6.ok2: Removed.
+
 2016-07-19         Arnold D. Robbins     <address@hidden>
 
        * Makefile.am (clos1way6): Add additional file to check result
diff --git a/test/Makefile.am b/test/Makefile.am
index 71e2141..3a51b3f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -163,7 +163,6 @@ EXTRA_DIST = \
        clos1way5.ok \
        clos1way6.awk \
        clos1way6.ok \
-       clos1way6.ok2 \
        closebad.awk \
        closebad.ok \
        clsflnam.awk \
@@ -2317,11 +2316,6 @@ symtab10:
        @AWKPATH="$(srcdir)" $(AWK) -D -f address@hidden < 
"$(srcdir)/address@hidden" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-clos1way6:
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-($(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@) || ($(CMP) 
"$(srcdir)"/address@hidden _$@ && rm -f _$@)
-
 # Targets generated for other tests:
 include Maketests
 
diff --git a/test/Makefile.in b/test/Makefile.in
index cfbc1a8..2906432 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -420,7 +420,6 @@ EXTRA_DIST = \
        clos1way5.ok \
        clos1way6.awk \
        clos1way6.ok \
-       clos1way6.ok2 \
        closebad.awk \
        closebad.ok \
        clsflnam.awk \
@@ -2754,11 +2753,6 @@ symtab10:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -D -f address@hidden < 
"$(srcdir)/address@hidden" >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
-clos1way6:
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-($(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@) || ($(CMP) 
"$(srcdir)"/address@hidden _$@ && rm -f _$@)
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
@@ -3823,6 +3817,11 @@ clos1way5:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+clos1way6:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 crlf:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index c43db83..525a44d 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1062,6 +1062,11 @@ clos1way5:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+clos1way6:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 crlf:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/clos1way6.awk b/test/clos1way6.awk
index 19779d7..f10c019 100644
--- a/test/clos1way6.awk
+++ b/test/clos1way6.awk
@@ -3,5 +3,5 @@ BEGIN {
        PROCINFO[cmd, "NONFATAL"] = 1
        print "test1" |& cmd; close(cmd, "to")
        fflush(cmd)
-       print "test2" |& cmd; print ERRNO
+       print "test2" |& cmd; print gensub(/number/, "descriptor", 1, ERRNO)
 }
diff --git a/test/clos1way6.ok2 b/test/clos1way6.ok2
deleted file mode 100644
index e49cb15..0000000
--- a/test/clos1way6.ok2
+++ /dev/null
@@ -1,3 +0,0 @@
-gawk: clos1way6.awk:5: warning: fflush: cannot flush: two-way pipe `cat - 
1>&2; sleep 2' has closed write end
-test1
-Bad file number

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

Summary of changes:
 test/ChangeLog     |    9 +++++++++
 test/Makefile.am   |    6 ------
 test/Makefile.in   |   11 +++++------
 test/Maketests     |    5 +++++
 test/clos1way6.awk |    2 +-
 test/clos1way6.ok2 |    3 ---
 6 files changed, 20 insertions(+), 16 deletions(-)
 delete mode 100644 test/clos1way6.ok2


hooks/post-receive
-- 
gawk