[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-858-g22b550f

[Eli Zaretskii]

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  22b550f985e356d4036b5ff724a50249d3816025 (commit)
      from  cbc3c53aeab707ff855cc809a842f1ca667275b7 (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=22b550f985e356d4036b5ff724a50249d3816025

commit 22b550f985e356d4036b5ff724a50249d3816025
Author: Eli Zaretskii <address@hidden>
Date:   Fri Apr 8 17:53:04 2016 +0300

    Fix the test suite for MinGW.

diff --git a/test/ChangeLog b/test/ChangeLog
index 59e2689..d45091a 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,12 @@
+2016-04-08  Eli Zaretskii  <address@hidden>
+
+       * clos1way2.awk:
+       * clos1way3.awk:
+       * clos1way4.awk:
+       * clos1way5.awk: Use "&&" instead of ";" to chain commands, so
+       that it works with stock MS-Windows shells as well.
+       * clos1way2.ok: Adjust the error message to the change in command.
+
 2016-04-08         Arnold D. Robbins     <address@hidden>
 
        * watchpoint1: Use $(srcdir) on input file so out-of-tree
diff --git a/test/clos1way2.awk b/test/clos1way2.awk
index 5794bec..c734c14 100644
--- a/test/clos1way2.awk
+++ b/test/clos1way2.awk
@@ -1,5 +1,6 @@
 {
-       cmd = "cat - 1>&2; sleep 2"
+       # We use "&&" and not ";" so it works with Windows shells as well.
+       cmd = "cat - 1>&2 && sleep 2"
        print |& cmd; close(cmd, "to")
        fflush(cmd)
        print |& cmd; print ERRNO
diff --git a/test/clos1way2.ok b/test/clos1way2.ok
index 67240ac..f6d7bcd 100644
--- a/test/clos1way2.ok
+++ b/test/clos1way2.ok
@@ -1,4 +1,4 @@
-gawk: clos1way2.awk:4: (FILENAME=- FNR=1) warning: fflush: cannot flush: 
two-way pipe `cat - 1>&2; sleep 2' has closed write end
+gawk: clos1way2.awk:4: (FILENAME=- FNR=1) warning: fflush: cannot flush: 
two-way pipe `cat - 1>&2 && sleep 2' has closed write end
 test
 gawk: clos1way2.awk:5: (FILENAME=- FNR=1) fatal: print: attempt to write to 
closed write end of two-way pipe
 EXIT CODE: 2
diff --git a/test/clos1way3.awk b/test/clos1way3.awk
index f69f667..2c4a6f4 100644
--- a/test/clos1way3.awk
+++ b/test/clos1way3.awk
@@ -1,5 +1,6 @@
 BEGIN {
-       cmd = "cat - 1>&2; sleep 2"
+       # We use "&&" and not ";" so it works with Windows shells as well.
+       cmd = "cat - 1>&2 && sleep 2"
        print "test1" |& cmd
        close(cmd, "to")
        print "test2" |& cmd
diff --git a/test/clos1way4.awk b/test/clos1way4.awk
index 6c68c5c..106e446 100644
--- a/test/clos1way4.awk
+++ b/test/clos1way4.awk
@@ -1,5 +1,6 @@
 BEGIN {
-       cmd = "cat - 1>&2; sleep 2"
+       # We use "&&" and not ";" so it works with Windows shells as well.
+       cmd = "cat - 1>&2 && sleep 2"
        printf "%s\n", "test1" |& cmd
        close(cmd, "to")
        printf "%s\n", "test2" |& cmd
diff --git a/test/clos1way5.awk b/test/clos1way5.awk
index ca1bd94..0af1909 100644
--- a/test/clos1way5.awk
+++ b/test/clos1way5.awk
@@ -1,5 +1,6 @@
 BEGIN {
-       cmd = "echo test1; echo test2; sleep 2"
+       # We use "&&" and not ";" so it works with Windows shells as well.
+       cmd = "echo test1&& echo test2&& sleep 2"
        cmd |& getline x
        print x
        close(cmd, "from")

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

Summary of changes:
 test/ChangeLog     |    9 +++++++++
 test/clos1way2.awk |    3 ++-
 test/clos1way2.ok  |    2 +-
 test/clos1way3.awk |    3 ++-
 test/clos1way4.awk |    3 ++-
 test/clos1way5.awk |    3 ++-
 6 files changed, 18 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
gawk