diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-08-10 10:51:26 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-08-11 11:23:11 +0200 |
| commit | efd53706481a717ae60f4c845ecfcb19573bacfb (patch) | |
| tree | 49739952bb7d368cd1645063f61fa58c5549f953 | |
| parent | 6605e7f787c59bb5c03d5817592dc67bc030f10b (diff) | |
| download | gnutls-efd53706481a717ae60f4c845ecfcb19573bacfb.tar.gz | |
tests: updated for new x86 host
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/p11-kit-trust.sh | 3 | ||||
| -rwxr-xr-x | tests/pkgconfig.sh | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 3ec2e478b9..5ce9a3ba31 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -345,6 +345,7 @@ TESTS_ENVIRONMENT = \ EXEEXT=$(EXEEXT) \ builddir="$(builddir)" \ top_builddir="$(top_builddir)" \ + libdir="$(libdir)" \ srcdir="$(srcdir)" if WINDOWS diff --git a/tests/p11-kit-trust.sh b/tests/p11-kit-trust.sh index 075f9bc99f..0af8272310 100755 --- a/tests/p11-kit-trust.sh +++ b/tests/p11-kit-trust.sh @@ -29,9 +29,10 @@ EXPORTED_FILE=out.$$.tmp DER_FILE=out-der.$$.tmp TMPFILE=out-tmp.$$.tmp -for lib in /usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/;do +for lib in ${libdir} ${libdir}/pkcs11 /usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/;do if test -f "${lib}/p11-kit-trust.so"; then MODULE="${lib}/p11-kit-trust.so" + echo "located ${MODULE}" break fi done diff --git a/tests/pkgconfig.sh b/tests/pkgconfig.sh index 6bd4e62f9c..6fea21511e 100755 --- a/tests/pkgconfig.sh +++ b/tests/pkgconfig.sh @@ -31,6 +31,12 @@ echo "$CFLAGS"|grep sanitize && exit 77 ${PKGCONFIG} --version >/dev/null || exit 77 +${PKGCONFIG} --libs nettle +if test $? != 0;then + echo "Nettle was not found in pkg-config" + exit 77 +fi + PKG_CONFIG_PATH=${top_builddir}/lib export PKG_CONFIG_PATH |