[gawk-diffs] [SCM] gawk branch, select, updated. gawk-4.1.0-1063-g66c827a

[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, select has been updated
       via  66c827a4607fa11c5c3d26eb8e3a4d63c2b05bef (commit)
      from  e81b32fd38fb79595e7773670818f78e9a3e2df2 (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=66c827a4607fa11c5c3d26eb8e3a4d63c2b05bef

commit 66c827a4607fa11c5c3d26eb8e3a4d63c2b05bef
Author: Andrew J. Schorr <address@hidden>
Date:   Mon Jan 5 14:12:25 2015 -0500

    Add read timeout/retry test.

diff --git a/test/ChangeLog b/test/ChangeLog
index 49b2684..36dbfaa 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,5 +1,12 @@
 2015-01-05         Andrew J. Schorr     <address@hidden>
 
+       * Makefile.am (EXTRA_DIST): Add timeout.awk and timeout.ok.
+       (BASIC_TESTS): Remove errno.
+       (GAWK_EXT_TESTS): Add errno and timeout.
+       * timeout.awk, timeout.ok: New files.
+
+2015-01-05         Andrew J. Schorr     <address@hidden>
+
        * Makefile.am (EXTRA_DIST): Add errno.awk, errno.in, and errno.ok.
        (BASIC_TESTS): Add errno.
        (errno): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 0feaebc..3ac9a69 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -923,6 +923,8 @@ EXTRA_DIST = \
        testext.ok \
        time.awk \
        time.ok \
+       timeout.awk \
+       timeout.ok \
        tradanch.awk \
        tradanch.in \
        tradanch.ok \
@@ -986,7 +988,7 @@ BASIC_TESTS = \
        childin clobber closebad clsflnam compare compare2 concat1 concat2 \
        concat3 concat4 convfmt \
        datanonl defref delargv delarpm2 delarprm delfunc dfamb1 dfastress 
dynlj \
-       eofsplit errno exit2 exitval1 exitval2 \
+       eofsplit exit2 exitval1 exitval2 \
        fcall_exit fcall_exit2 fldchg fldchgnf fnamedat fnarray fnarray2 \
        fnaryscl fnasgnm fnmisc fordel forref forsimp fsbs fsrs fsspcoln \
        fstabplus funsemnl funsmnam funstack \
@@ -1021,7 +1023,7 @@ UNIX_TESTS = \
 GAWK_EXT_TESTS = \
        aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
        backw badargs beginfile1 beginfile2 binmode1 charasbytes \
-       colonwarn clos1way dbugeval delsub devfd devfd1 devfd2 dumpvars exit \
+       colonwarn clos1way dbugeval delsub devfd devfd1 devfd2 dumpvars errno 
exit \
        fieldwdth fpat1 fpat2 fpat3  fpatnull fsfwfs funlen \
        functab1 functab2 functab3 fwtest fwtest2 fwtest3 \
        genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
@@ -1037,7 +1039,8 @@ GAWK_EXT_TESTS = \
        rsstart2 rsstart3 rstest6 shadow sortfor sortu split_after_fpat \
        splitarg4 strftime \
        strtonum switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 \
-       symtab7 symtab8 symtab9
+       symtab7 symtab8 symtab9 \
+       timeout
 
 EXTRA_TESTS = inftest regtest
 
diff --git a/test/Makefile.in b/test/Makefile.in
index fa86fc7..874a92d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -455,6 +455,9 @@ EXTRA_DIST = \
        dynlj.ok \
        eofsplit.awk \
        eofsplit.ok \
+       errno.awk \
+       errno.in \
+       errno.ok \
        exit.ok \
        exit.sh \
        exit2.awk \
@@ -1167,6 +1170,8 @@ EXTRA_DIST = \
        testext.ok \
        time.awk \
        time.ok \
+       timeout.awk \
+       timeout.ok \
        tradanch.awk \
        tradanch.in \
        tradanch.ok \
@@ -1264,7 +1269,7 @@ UNIX_TESTS = \
 GAWK_EXT_TESTS = \
        aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
        backw badargs beginfile1 beginfile2 binmode1 charasbytes \
-       colonwarn clos1way dbugeval delsub devfd devfd1 devfd2 dumpvars exit \
+       colonwarn clos1way dbugeval delsub devfd devfd1 devfd2 dumpvars errno 
exit \
        fieldwdth fpat1 fpat2 fpat3  fpatnull fsfwfs funlen \
        functab1 functab2 functab3 fwtest fwtest2 fwtest3 \
        genpot gensub gensub2 getlndir gnuops2 gnuops3 gnureops \
@@ -1280,7 +1285,8 @@ GAWK_EXT_TESTS = \
        rsstart2 rsstart3 rstest6 shadow sortfor sortu split_after_fpat \
        splitarg4 strftime \
        strtonum switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 \
-       symtab7 symtab8 symtab9
+       symtab7 symtab8 symtab9 \
+       timeout
 
 EXTRA_TESTS = inftest regtest
 INET_TESTS = inetdayu inetdayt inetechu inetecht
@@ -1736,6 +1742,11 @@ devfd::
        @$(AWK) 1 /dev/fd/4 /dev/fd/5 4<"$(srcdir)"/devfd.in4 
5<"$(srcdir)"/devfd.in5 >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+errno:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 fflush::
        @echo $@
        @"$(srcdir)"/fflush.sh >_$@
@@ -3688,6 +3699,11 @@ symtab7:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+timeout:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 double1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index e1b92bf..97f2ed5 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1257,6 +1257,11 @@ symtab7:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  < 
"$(srcdir)"/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+timeout:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 double1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/timeout.awk b/test/timeout.awk
new file mode 100644
index 0000000..ccf4537
--- /dev/null
+++ b/test/timeout.awk
@@ -0,0 +1,26 @@
+BEGIN {
+       cmd = "echo hello; sleep 1; echo goodbye"
+
+       print "With timeouts"
+       PROCINFO[cmd, "READ_TIMEOUT"] = 300
+       while ((rc = (cmd | getline x)) > 0)
+               print x
+       if (rc < 0)
+               print rc, (PROCINFO["errno"] != 0), (ERRNO != "")
+       print (close(cmd) != 0)
+
+       PROCINFO[cmd, "RETRY"]
+       print ""
+       print "With timeouts and retries"
+       while (((rc = (cmd | getline x)) > 0) || (rc == -2)) {
+               if (rc > 0) {
+                       print x
+                       n = 0
+               }
+               else
+                       print ++n, "timed out; trying again"
+       }
+       if (rc < 0)
+               print rc, (PROCINFO["errno"] != 0), (ERRNO != "")
+       print (close(cmd) != 0)
+}
diff --git a/test/timeout.ok b/test/timeout.ok
new file mode 100644
index 0000000..a388747
--- /dev/null
+++ b/test/timeout.ok
@@ -0,0 +1,12 @@
+With timeouts
+hello
+-1 1 1
+1
+
+With timeouts and retries
+hello
+1 timed out; trying again
+2 timed out; trying again
+3 timed out; trying again
+goodbye
+0

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

Summary of changes:
 test/ChangeLog   |    7 +++++++
 test/Makefile.am |    9 ++++++---
 test/Makefile.in |   20 ++++++++++++++++++--
 test/Maketests   |    5 +++++
 test/timeout.awk |   26 ++++++++++++++++++++++++++
 test/timeout.ok  |   12 ++++++++++++
 6 files changed, 74 insertions(+), 5 deletions(-)
 create mode 100644 test/timeout.awk
 create mode 100644 test/timeout.ok


hooks/post-receive
-- 
gawk