From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Thu, 10 Aug 2017 08:51:26 +0000 (+0200)
Subject: tests: updated for new x86 host
X-Git-Tag: gnutls_3_6_0~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efd53706481a717ae60f4c845ecfcb19573bacfb;p=thirdparty%2Fgnutls.git

tests: updated for new x86 host

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
---

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