[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-2732-gd797cd4

[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, master has been updated
       via  d797cd4ef6749eafe23965472803926f573209a0 (commit)
      from  2569d21513246eb8bdded601a18bf8278c80211d (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=d797cd4ef6749eafe23965472803926f573209a0

commit d797cd4ef6749eafe23965472803926f573209a0
Author: Eli Zaretskii <address@hidden>
Date:   Sat Aug 19 11:55:56 2017 +0300

    Fix the test suite for the MinGW build.

diff --git a/extension/ChangeLog b/extension/ChangeLog
index e0a2466..2ab3ebb 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-19  Eli Zaretskii  <address@hidden>
+
+       * testext.c (test_get_file): Don't remove outfile from the Gawk
+       script, as that fails on MS-Windows.
+
 2017-08-14         Arnold D. Robbins     <address@hidden>
 
        * configure.ac: Bump associated gawk version.
diff --git a/extension/testext.c b/extension/testext.c
index 572475e..c1a03f5 100644
--- a/extension/testext.c
+++ b/extension/testext.c
@@ -847,7 +847,7 @@ BEGIN {
        while ((getline < alias) > 0)
                printf "File [%s] nr [%s]: %s\n", alias, ++nr, $0
        close(alias)
-       system("rm " outfile)
+#      system("rm " outfile)
        print ""
 }
 */
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 3b8363b..f91b147 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,5 +1,11 @@
 2017-08-19  Eli Zaretskii  <address@hidden>
 
+       * Makefile.tst (SLASH): New variable for use it readdir_test.
+       (mbprintf5, profile4, profile5, profile8, getfile): Update the
+       expected failure messages.
+       (readdir_test): Use SLASH instead of a literal /, as the latter
+       gets converted by MSYS Bash to the corresponding Windows directory.
+
        * Makefile.ext (MPFR, MPFR_LIBS): New variables, used in compiling
        intdiv.c.
        (ALL_EXTENSIONS): Add intdiv and readdir_test.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index d7f3550..a553400 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -69,7 +69,8 @@ AWKPROG = ../gawk.exe
 # index numbers, because this is what the readdir test expects.
 # Otherwise, the readdir test will fail.  (The MSYS ls.exe doesn't
 # report full index values.)
-LS = ls.exe
+#LS = ls.exe
+LS = /d/usr/bin/ls.exe
 
 # Define PGAWK
 PGAWK = ../gawk.exe -p
@@ -118,7 +119,13 @@ MKDIR = mkdir
 DATE = gdate
 
 # MS-DOS and OS/2 use ; as a PATH delimiter
-PATH_SEPARATOR = ;
+PATH_SEPARATOR = :
+
+# Argument to -F to produce -F/, should be // for MinGW, / otherwise,
+# because MSYS Bash converts a single slash to the equivalent Windows
+# directory.
+#SLASH = /
+SLASH = //
 
 # Non-default GREP_OPTIONS might fail the badargs test
 export GREP_OPTIONS=
@@ -858,7 +865,7 @@ mbprintf4::
 mbprintf5::
        @echo $@
        @case `uname` in \
-       CYGWIN*) echo this test fails on cygwin --- skipping $@ ;; \
+       CYGWIN* | MINGW32*) echo this test fails on this system --- skipping $@ 
;; \
        *) \
        GAWKLOCALE=en_US.UTF-8 ; export GAWKLOCALE ; \
        $(AWK) -f "$(srcdir)"/address@hidden "$(srcdir)"/address@hidden >_$@ 
2>&1 || echo EXIT CODE: $$? >> _$@ ; \
@@ -942,13 +949,11 @@ profile3:
 
 profile4:
        @echo $@
-       @echo Expect profile4 to fail with MinGW
        @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 profile5:
        @echo $@
-       @echo Expect profile5 to abort with MinGW
        @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
 #      @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
        @-$(TESTOUTCMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
@@ -967,7 +972,6 @@ profile7:
 
 profile8:
        @echo $@
-       @echo Expect profile8 to fail with MinGW
        @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/address@hidden > /dev/null
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -1166,6 +1170,7 @@ testext::
 
 getfile:
        @echo $@
+       @echo Expect getfile to fail with MinGW.
        @AWKPATH="$(srcdir)" $(AWK) -v TESTEXT_QUIET=1 -ltestext -f 
address@hidden < $(srcdir)/address@hidden >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
@@ -1187,7 +1192,7 @@ readdir:
 
 readdir_test:
        @echo $@
-       @$(AWK) -lreaddir -F/ '{printf "[%s] [%s] [%s] [%s]\n", $$1, $$2, $$3, 
$$4}' "$(top_srcdir)" > address@hidden
+       @$(AWK) -lreaddir -F$(SLASH) '{printf "[%s] [%s] [%s] [%s]\n", $$1, 
$$2, $$3, $$4}' "$(top_srcdir)" > address@hidden
        @$(AWK) -lreaddir_test '{printf "[%s] [%s] [%s] [%s]\n", $$1, $$2, $$3, 
$$4}' "$(top_srcdir)" > _$@
        @-$(CMP) address@hidden _$@ && rm -f address@hidden _$@
 

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

Summary of changes:
 extension/ChangeLog |  5 +++++
 extension/testext.c |  2 +-
 pc/ChangeLog        |  6 ++++++
 pc/Makefile.tst     | 19 ++++++++++++-------
 4 files changed, 24 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
gawk