[gawk-diffs] [SCM] gawk branch, feature/improve-tests, updated. gawk-4.1.0-3099-gf1d3943

[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, feature/improve-tests has been updated
       via  f1d3943e11b90ba08d06dc2369d1e784f23518f6 (commit)
      from  182b2bbb8e05961628d3011f41bdf5ea7bac4f0d (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=f1d3943e11b90ba08d06dc2369d1e784f23518f6

commit f1d3943e11b90ba08d06dc2369d1e784f23518f6
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Apr 23 06:06:40 2018 +0300

    Further test improvements for MinGW.

diff --git a/test/ChangeLog b/test/ChangeLog
index 05bad12..d0dbc97 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,12 @@
+2018-04-23         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (EXPECTED_FAIL_MINGW): Remove fmtspcl and
+       and add readdir_retest.
+       (mbprintf5): Add checks for MinGW and DJGPP along with Cygwin.
+       Thanks to Scott Deifik for the report.
+       (nlstringtest): Redirect $(CMP) output to /dev/null. Not sure
+       why this is necessary but it seems to be.
+
 2018-04-22         Juan Manuel Guerrero  <address@hidden>
 
        * Makefile.am (EXPECTED_FAIL_DJGPP): Add gnuops3, gnureops,
diff --git a/test/Makefile.am b/test/Makefile.am
index 4ba3253..940812b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1397,11 +1397,10 @@ EXPECTED_FAIL_DJGPP = \
 
 # List of tests that fail on MinGW
 EXPECTED_FAIL_MINGW = \
-       backbigs1 backsmalls1 clos1way6 devfd devfd1 devfd2 errno \
-       exitval2 fmtspcl \
+       backbigs1 backsmalls1 clos1way6 devfd devfd1 devfd2 errno exitval2 \
        fork fork2 fts getfile getlnhd ignrcas3 inetdayt inetecht mbfw1 \
        mbprintf1 mbprintf4 mbstr1 mbstr2 pid pipeio2 pty1 pty2 readdir \
-       readdir_test rstest4 rstest5 status-close timeout
+       readdir_test readdir_retest rstest4 rstest5 status-close timeout
 
 # List of the files that appear in manual tests or are for reserve testing:
 GENTESTS_UNUSED = Makefile.in checknegtime.awk dtdgport.awk gtlnbufv.awk \
@@ -1833,7 +1832,7 @@ mixed1::
 mbprintf5::
        @echo $@
        @case `uname` in \
-       CYGWIN*) echo this test fails on cygwin --- skipping $@ ;; \
+       CYGWIN* | MINGW32* | *MS-DOS*) echo this test fails on this system --- 
skipping $@ ;; \
        *) \
        [ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE ; \
        $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@ ; \
@@ -2178,11 +2177,12 @@ nonfatal1:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 2>&1 | $(AWK) '{print 
gensub(/invalid[:].*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+# 4/2018: On first call to $(CMP), send to /dev/null even with -s for MinGW.
 nlstringtest::
        @echo $@
        @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; export GAWKLOCALE ; \
        AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)" >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
-       @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ ; \
+       @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ > /dev/null ; \
        then \
                rm -f _$@ ; \
        else \
diff --git a/test/Makefile.in b/test/Makefile.in
index 7422b8d..8eb384c 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1656,11 +1656,10 @@ EXPECTED_FAIL_DJGPP = \
 
 # List of tests that fail on MinGW
 EXPECTED_FAIL_MINGW = \
-       backbigs1 backsmalls1 clos1way6 devfd devfd1 devfd2 errno \
-       exitval2 fmtspcl \
+       backbigs1 backsmalls1 clos1way6 devfd devfd1 devfd2 errno exitval2 \
        fork fork2 fts getfile getlnhd ignrcas3 inetdayt inetecht mbfw1 \
        mbprintf1 mbprintf4 mbstr1 mbstr2 pid pipeio2 pty1 pty2 readdir \
-       readdir_test rstest4 rstest5 status-close timeout
+       readdir_test readdir_retest rstest4 rstest5 status-close timeout
 
 
 # List of the files that appear in manual tests or are for reserve testing:
@@ -2278,7 +2277,7 @@ mixed1::
 mbprintf5::
        @echo $@
        @case `uname` in \
-       CYGWIN*) echo this test fails on cygwin --- skipping $@ ;; \
+       CYGWIN* | MINGW32* | *MS-DOS*) echo this test fails on this system --- 
skipping $@ ;; \
        *) \
        [ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE ; \
        $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@ ; \
@@ -2621,11 +2620,12 @@ nonfatal1:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 2>&1 | $(AWK) '{print 
gensub(/invalid[:].*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+# 4/2018: On first call to $(CMP), send to /dev/null even with -s for MinGW.
 nlstringtest::
        @echo $@
        @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=fr_FR.UTF-8 ; export GAWKLOCALE ; \
        AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)" >_$@ 2>&1 || 
echo EXIT CODE: $$? >>_$@
-       @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ ; \
+       @-if $(CMP) -s "$(srcdir)"/nlstringtest-nogettext.ok _$@ > /dev/null ; \
        then \
                rm -f _$@ ; \
        else \

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

Summary of changes:
 test/ChangeLog   |  9 +++++++++
 test/Makefile.am | 10 +++++-----
 test/Makefile.in | 10 +++++-----
 3 files changed, 19 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
gawk