Pass the LIBTOOL variable into test scripts

That allows using the detected libtool in scripts.
That corrects an issue on OS X systems that ship a
different libtool. Reported by Daniel E. Macks.

diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 9060cfaa6f42e1ed2646f6623f57c2f6e3f1a3ea..0d648f36d0eee492060479effe43853cf045c470 100644 (file)
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -44,6 +44,7 @@ endif
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
        LC_ALL="C"                              \
        VALGRIND="$(VALGRIND)"                  \
+       LIBTOOL="$(LIBTOOL)"                    \
        top_builddir="$(top_builddir)"          \
        srcdir="$(srcdir)"
 

diff --git a/tests/cert-tests/aki b/tests/cert-tests/aki
index 3421fa96b8675bacfa2c4100f1a32e2122d38bc2..5522a20f0a3074dd7107a23e4fb8e8773bc94fca 100755 (executable)
--- a/tests/cert-tests/aki
+++ b/tests/cert-tests/aki
@@ -26,7 +26,7 @@ srcdir=${srcdir:-.}
 CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
 DIFF=${DIFF:-diff}
 if ! test -z "${VALGRIND}";then
-VALGRIND="libtool --mode=execute ${VALGRIND}"
+VALGRIND="${LIBTOOL:libtool} --mode=execute ${VALGRIND}"
 fi
 
 $VALGRIND $CERTTOOL --certificate-info --infile $srcdir/aki-cert.pem \

diff --git a/tests/cert-tests/pathlen b/tests/cert-tests/pathlen
index f815ba61bd3052ca3bdafab148737f676f6f15e6..f52ead70be859d2951e32316453eadd0d070330a 100755 (executable)
--- a/tests/cert-tests/pathlen
+++ b/tests/cert-tests/pathlen
@@ -26,7 +26,7 @@ srcdir=${srcdir:-.}
 CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
 DIFF=${DIFF:-diff}
 if ! test -z "${VALGRIND}";then
-VALGRIND="libtool --mode=execute ${VALGRIND}"
+VALGRIND="${LIBTOOL:libtool} --mode=execute ${VALGRIND}"
 fi
 
 $VALGRIND $CERTTOOL --certificate-info --infile $srcdir/ca-no-pathlen.pem \

diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
index 881bd738562692b55af45d716bb38dffa87778e1..54077fba28bec688dfb88bafb053c8a6d3fbc5fe 100755 (executable)
--- a/tests/cert-tests/pem-decoding
+++ b/tests/cert-tests/pem-decoding
@@ -26,7 +26,7 @@ srcdir=${srcdir:-.}
 CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
 DIFF=${DIFF:-diff}
 if ! test -z "${VALGRIND}";then
-VALGRIND="libtool --mode=execute ${VALGRIND}"
+VALGRIND="${LIBTOOL:libtool} --mode=execute ${VALGRIND}"
 fi
 
 #check whether "funny" spaces can be interpreted

diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index 4e28acc706284f9b2c3cf473f9a3df0dce57b74f..6835eae6c57edab83feabce2d7cd3a21fae10095 100644 (file)
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -95,9 +95,10 @@ TESTS += pkcs11-chainverify pkcs11-get-issuer
 endif
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
-       LC_ALL="C"                                              \
-       VALGRIND="$(VALGRIND)"                  \
-       top_builddir="$(top_builddir)"                          \
+       LC_ALL="C"                                      \
+       VALGRIND="$(VALGRIND)"                          \
+       LIBTOOL="$(LIBTOOL)"                            \
+       top_builddir="$(top_builddir)"                  \
        srcdir="$(srcdir)"
 
 if ENABLE_DANE

diff --git a/tests/suite/invalid-cert b/tests/suite/invalid-cert
index 31755db68944f4acb690cfd9f045702bb559ee33..6c76efe0dcf679ae59851f686039cdf889664549 100755 (executable)
--- a/tests/suite/invalid-cert
+++ b/tests/suite/invalid-cert
@@ -23,7 +23,7 @@
 srcdir=${srcdir:-.}
 CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
 if ! test -z "${VALGRIND}";then
-VALGRIND="libtool --mode=execute ${VALGRIND}"
+VALGRIND="${LIBTOOL:libtool} --mode=execute ${VALGRIND}"
 fi
 
 $VALGRIND $CERTTOOL --certificate-info --inder --infile $srcdir/invalid-cert.der 2>/dev/null

diff --git a/tests/suite/testcompat-main b/tests/suite/testcompat-main
index e0604a0d95343649ef41cdb075c0abf228700127..791925116c351e959cdec328784f60a9eefc0ccf 100755 (executable)
--- a/tests/suite/testcompat-main
+++ b/tests/suite/testcompat-main
@@ -25,7 +25,7 @@ CLI="${CLI:-../../src/gnutls-cli$EXEEXT}"
 PORT="${PORT:-5568}"
 unset RETCODE
 if ! test -z "${VALGRIND}";then
-VALGRIND="libtool --mode=execute ${VALGRIND}"
+VALGRIND="${LIBTOOL:libtool} --mode=execute ${VALGRIND}"
 fi
 
 if test "${WINDIR}" != "";then

diff --git a/tests/suite/testrandom b/tests/suite/testrandom
index 6d431db1df21b9214c6599cf5f73c9cfd5c0299b..7c429058470259d16b144cd12a3b83026666e5fe 100755 (executable)
--- a/tests/suite/testrandom
+++ b/tests/suite/testrandom
@@ -23,7 +23,7 @@
 srcdir=${srcdir:-.}
 CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
 if ! test -z "${VALGRIND}";then
-VALGRIND="libtool --mode=execute ${VALGRIND}"
+VALGRIND="${LIBTOOL:libtool} --mode=execute ${VALGRIND}"
 fi
 
 counter=0