diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-06-05 09:13:39 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-06-05 09:20:14 +0200 |
| commit | 4722f38295fa77e74eef99129eef6df5a7a4aaab (patch) | |
| tree | 41d0e563d9bec86ee5275d9c213ce4b8e1e36a95 | |
| parent | 4bb650915bf6b53e84d344b2d0a5509ce967a6c7 (diff) | |
| download | gnutls-4722f38295fa77e74eef99129eef6df5a7a4aaab.tar.gz | |
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.
| -rw-r--r-- | tests/cert-tests/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/cert-tests/aki | 2 | ||||
| -rwxr-xr-x | tests/cert-tests/pathlen | 2 | ||||
| -rwxr-xr-x | tests/cert-tests/pem-decoding | 2 | ||||
| -rw-r--r-- | tests/suite/Makefile.am | 7 | ||||
| -rwxr-xr-x | tests/suite/invalid-cert | 2 | ||||
| -rwxr-xr-x | tests/suite/testcompat-main | 2 | ||||
| -rwxr-xr-x | tests/suite/testrandom | 2 |
8 files changed, 11 insertions, 9 deletions
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am index 9060cfaa6f..0d648f36d0 100644 --- 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 3421fa96b8..5522a20f0a 100755 --- 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 f815ba61bd..f52ead70be 100755 --- 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 881bd73856..54077fba28 100755 --- 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 4e28acc706..6835eae6c5 100644 --- 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 31755db689..6c76efe0dc 100755 --- 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 e0604a0d95..791925116c 100755 --- 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 6d431db1df..7c42905847 100755 --- 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 |