diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 9 | ||||
| -rw-r--r-- | test/Makefile.in | 8 | ||||
| -rw-r--r-- | test/filefuncs.awk | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 20b4d6e2..fda3b681 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,12 @@ +2013-05-14 Eli Zaretskii <eliz@gnu.org> + + * Makefile.in (mpfr-tests, shlib-tests): Add a blank character + between ' and /FOO/ in Gawk command lines, for the benefit of + testing under MSYS Bash. + + * filefuncs.awk (BEGIN): Call 'stat' on gawkapi.o, not on gawk, + which does not exist on systems that produce gawk.exe. + 2013-05-09 Arnold D. Robbins <arnold@skeeve.com> * 4.1.0: Release tar ball made. diff --git a/test/Makefile.in b/test/Makefile.in index 46e7f57a..bfecafc0 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1453,14 +1453,18 @@ inet: inetmesg $(INET_TESTS) machine-tests: $(MACHINE_TESTS) +# The blank between ' and /MPFR/ is for running tests on Windows under +# MSYS, which thinks /MPFR is a Unix-style file name and converts it +# to Windows format, butchering it in the process. Likewise for /API/ +# in the next shlib-tests. mpfr-tests: - @if $(AWK) --version | $(AWK) '/MPFR/ { exit 1 }' ; then \ + @if $(AWK) --version | $(AWK) ' /MPFR/ { exit 1 }' ; then \ echo MPFR tests not supported on this system ; \ else $(MAKE) $(MPFR_TESTS) ; \ fi shlib-tests: - @if $(AWK) --version | $(AWK) '/API/ { exit 1 }' ; then \ + @if $(AWK) --version | $(AWK) ' /API/ { exit 1 }' ; then \ echo shlib tests not supported on this system ; \ else $(MAKE) shlib-real-tests ; \ fi diff --git a/test/filefuncs.awk b/test/filefuncs.awk index aa532741..4bbfcb55 100644 --- a/test/filefuncs.awk +++ b/test/filefuncs.awk @@ -6,8 +6,8 @@ BEGIN { exit 1 } - if (stat(ARGV[0], st) < 0) { - printf "Error: stat(%s) failed with ERRNO %s\n", ARGV[0], ERRNO + if (stat(ARGV[0] "api.o", st) < 0) { + printf "Error: stat(%s) failed with ERRNO %s\n", ARGV[0] "api.o", ERRNO exit 1 } |