tests: Find p11-kit module directory via pkg-config.

* tests/p11-kit-load.sh (P11_MODULE_PATH): New variable; use it to
locate p11-kit-trust.so.
* tests/p11-kit-trust.sh (PKG_CONFIG, P11_MODULE_PATH): Likewise.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

diff --git a/tests/p11-kit-load.sh b/tests/p11-kit-load.sh
index 36629241da0590d7b2066af288b3ae9fc4f49574..f53e21b5ee1b7945df75ff0487b44252c752041e 100755 (executable)
--- a/tests/p11-kit-load.sh
+++ b/tests/p11-kit-load.sh
@@ -30,7 +30,9 @@ P11DIR="p11-kit-conf.$$.tmp"
 PIN=1234
 PUK=1234
 
-for lib in ${libdir} ${libdir}/pkcs11 /usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/;do
+P11_MODULE_PATH=$(${PKG_CONFIG} p11-kit-1 --variable=p11_module_path)
+
+for lib in "${P11_MODULE_PATH}" ${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
                TRUST_MODULE="${lib}/p11-kit-trust.so"
                echo "located ${MODULE}"

diff --git a/tests/p11-kit-trust.sh b/tests/p11-kit-trust.sh
index cba1daaf9a2c0bab993fe659a634b990a85339d2..537e4a3b49344e03cc23a37a796eeaf22684206f 100755 (executable)
--- a/tests/p11-kit-trust.sh
+++ b/tests/p11-kit-trust.sh
@@ -23,12 +23,15 @@
 : ${P11TOOL=../src/p11tool${EXEEXT}}
 : ${CERTTOOL=../src/certtool${EXEEXT}}
 : ${DIFF=diff}
+: ${PKG_CONFIG=pkg-config}
 
 EXPORTED_FILE=out.$$.tmp
 DER_FILE=out-der.$$.tmp
 TMPFILE=out-tmp.$$.tmp
 
-for lib in ${libdir} ${libdir}/pkcs11 /usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/;do
+P11_MODULE_PATH=$(${PKG_CONFIG} p11-kit-1 --variable=p11_module_path)
+
+for lib in "${P11_MODULE_PATH}" ${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}"