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 3ec2e478b960d06b1dac1576cd1f751d6422e91c..5ce9a3ba31466af00df6442d942cb2901d6f39ea 100644 (file)
--- 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 075f9bc99ff0426ab20c65d4d025559a2709c3f0..0af827231093fdc7827558c8917721af9adc9098 100755 (executable)
--- 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 6bd4e62f9cc81f2fc52f037a3079fe0970626e52..6fea21511e24884b675bd7a94ac377c5c1c9b585 100755 (executable)
--- 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