test/Makefile.am | 3 +++
test/run-test.sh | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit fd2e155665ea2c69cd8014962061349a0cc794e6
Author: Jon Turney <jon.turney@xxxxxxxxxxxxxxxx>
Date: Mon Apr 15 20:01:22 2019 +0100
Only use test wrapper-script if host is MinGW
Currently it fails if the executable extension is .exe, but wine isn't
available (e.g. on Cygwin)
Possibly the check to use this wrapper should be even more restrictive
e.g. checking if cross-building and/or if wine is available.
diff --git a/test/Makefile.am b/test/Makefile.am
index fc47a50..f9c2158 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,12 +6,15 @@ TEST_EXTENSIONS = \
AM_TESTS_ENVIRONMENT= \
src=${srcdir}; export src; \
EXEEXT=${EXEEXT}; export EXEEXT; \
+ LOG_COMPILER=${LOG_COMPILER} ; export LOG_COMPILER; \
$(NULL)
BUILT_SOURCES = $(builddir)/out.expected
SH_LOG_COMPILER = sh
+if OS_WIN32
LOG_COMPILER = ${srcdir}/wrapper-script.sh
+endif
TESTS=run-test.sh
TESTDATA = \
diff --git a/test/run-test.sh b/test/run-test.sh
index b55efcb..12198ff 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -32,7 +32,6 @@ BASEDIR=`mktemp -d --tmpdir fontconfig.XXXXXXXX`
FONTDIR="$BASEDIR"/fonts
CACHEDIR="$BASEDIR"/cache.dir
EXPECTED=${EXPECTED-"out.expected"}
-LOG_COMPILER=${LOG_COMPILER-"$TESTDIR/wrapper-script.sh"}
ECHO=true
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/fontconfig
