diff options
| -rw-r--r-- | extension/ChangeLog | 5 | ||||
| -rw-r--r-- | extension/testext.c | 2 | ||||
| -rw-r--r-- | pc/ChangeLog | 6 | ||||
| -rw-r--r-- | pc/Makefile.tst | 19 |
4 files changed, 24 insertions, 8 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index e0a24664..2ab3ebb7 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,8 @@ +2017-08-19 Eli Zaretskii <eliz@gnu.org> + + * 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 <arnold@skeeve.com> * configure.ac: Bump associated gawk version. diff --git a/extension/testext.c b/extension/testext.c index 572475e0..c1a03f5b 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 3b8363b7..f91b1470 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,5 +1,11 @@ 2017-08-19 Eli Zaretskii <eliz@gnu.org> + * 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 d7f3550c..a5534002 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)"/$@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@ ; \ @@ -942,13 +949,11 @@ profile3: profile4: @echo $@ - @echo Expect profile4 to fail with MinGW @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/$@.awk > /dev/null @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ profile5: @echo $@ - @echo Expect profile5 to abort with MinGW @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/$@.awk > /dev/null # @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @-$(TESTOUTCMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -967,7 +972,6 @@ profile7: profile8: @echo $@ - @echo Expect profile8 to fail with MinGW @$(AWK) --pretty-print=_$@ -f "$(srcdir)"/$@.awk > /dev/null @-$(CMP) "$(srcdir)"/$@.ok _$@ && 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 $@.awk < $(srcdir)/$@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && 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)" > $@.ok + @$(AWK) -lreaddir -F$(SLASH) '{printf "[%s] [%s] [%s] [%s]\n", $$1, $$2, $$3, $$4}' "$(top_srcdir)" > $@.ok @$(AWK) -lreaddir_test '{printf "[%s] [%s] [%s] [%s]\n", $$1, $$2, $$3, $$4}' "$(top_srcdir)" > _$@ @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ |