--- a/tests/Makefile.am 2022-12-29 12:10:49.000000000 -0800 +++ b/tests/Makefile.am 2025-06-18 07:50:10.188339859 -0700 @@ -5,7 +5,7 @@ TEST_EXTENSIONS = .dic AM_TESTS_ENVIRONMENT = export HUNSPELL=$(top_builddir)/src/tools/hunspell; \ export ANALYZE=$(top_builddir)/src/tools/analyze; \ - export LIBTOOL=$(top_builddir)/libtool; + export LIBTOOL="$(LIBTOOL)"; DIC_LOG_COMPILER = $(top_srcdir)/tests/test.sh TESTS = \ diff --git a/tests/test.sh b/tests/test.sh index c02cc21..6fb944f 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -66,15 +66,16 @@ shopt -s expand_aliases [[ "$HUNSPELL" = "" ]] && HUNSPELL="$(dirname $0)"/../src/tools/hunspell [[ "$ANALYZE" = "" ]] && ANALYZE="$(dirname $0)"/../src/tools/hunspell-analyze [[ "$LIBTOOL" = "" ]] && LIBTOOL="$(dirname $0)"/../libtool -alias hunspell='"$LIBTOOL" --mode=execute "$HUNSPELL"' -alias analyze='"$LIBTOOL" --mode=execute "$ANALYZE"' +libtool=($LIBTOOL) +alias hunspell='"${libtool[@]}" --mode=execute "$HUNSPELL"' +alias analyze='"${libtool[@]}" --mode=execute "$ANALYZE"' if [[ "$VALGRIND" != "" ]]; then mkdir $TEMPDIR 2> /dev/null || : rm -f $TEMPDIR/test.pid* || : mkdir $TEMPDIR/badlogs 2> /dev/null || : - alias hunspell='"$LIBTOOL" --mode=execute valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid "$HUNSPELL"' - alias analyze='"$LIBTOOL" --mode=execute valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid "$ANALYZE"' + alias hunspell='"$libtool" --mode=execute valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid "$HUNSPELL"' + alias analyze='"$libtool" --mode=execute valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid "$ANALYZE"' fi CR=$(printf "\r")