Commit fd2e1556 authored by Jon Turney's avatar Jon Turney

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.
parent d28681af
Pipeline #35677 passed with stage
in 5 minutes and 33 seconds
......@@ -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 = \
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment