aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/ChangeLog6
-rw-r--r--test/Makefile.am8
2 files changed, 12 insertions, 2 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index fda3b681..7d3da4de 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-20 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.am (mpfr-tests, shlib-tests): Propogate Eli's changes
+ and comment of 2013-05-14 to here, so that they get passed into
+ Makefile.in whenever Makefile.am is modified.
+
2013-05-14 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (mpfr-tests, shlib-tests): Add a blank character
diff --git a/test/Makefile.am b/test/Makefile.am
index 4376691a..c740aa18 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1055,14 +1055,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