From 835cee2e5a07be062405e8c96a2a6851b7734d82 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Sat, 1 May 2021 22:16:51 +0200
Subject: [PATCH] tests: Add correct path to enable out-of-source build

---
 tests/Makefile.am                            | 6 ++++++
 tests/common.sh                              | 2 +-
 tests/test-duplicate-symbols.sh              | 2 +-
 tests/test-manpage.sh                        | 4 ++--
 tests/test-pkcs11-tool-allowed-mechanisms.sh | 3 ++-
 tests/test-pkcs11-tool-sign-verify.sh        | 3 ++-
 tests/test-pkcs11-tool-test-threads.sh       | 3 ++-
 tests/test-pkcs11-tool-test.sh               | 3 ++-
 8 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7213bd9c..1d95b30c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,11 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
+AM_TESTS_ENVIRONMENT = \
+	SOURCE_PATH='$(top_srcdir)'; \
+	export SOURCE_PATH; \
+	BUILD_PATH='$(top_builddir)'; \
+	export BUILD_PATH;
+
 dist_noinst_SCRIPTS = common.sh \
                       test-manpage.sh \
                       test-duplicate-symbols.sh \
diff --git a/tests/common.sh b/tests/common.sh
index 64f7691f..aa1312eb 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -3,7 +3,7 @@
 
 SOPIN="12345678"
 PIN="123456"
-PKCS11_TOOL="../src/tools/pkcs11-tool"
+PKCS11_TOOL="$BUILD_PATH/src/tools/pkcs11-tool"
 
 softhsm_paths="/usr/local/lib/softhsm/libsofthsm2.so \
 	/usr/lib/softhsm/libsofthsm2.so
diff --git a/tests/test-duplicate-symbols.sh b/tests/test-duplicate-symbols.sh
index 9e5061d9..01c2c88b 100755
--- a/tests/test-duplicate-symbols.sh
+++ b/tests/test-duplicate-symbols.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-SOURCE_PATH=..
+SOURCE_PATH=${SOURCE_PATH:-../}
 
 EXPORTS=`find "${SOURCE_PATH}" -name "*exports"`
 
diff --git a/tests/test-manpage.sh b/tests/test-manpage.sh
index a8d53d4c..eb35aee1 100755
--- a/tests/test-manpage.sh
+++ b/tests/test-manpage.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
-SOURCE_PATH=../
+#!/bin/bash -x
+SOURCE_PATH=${SOURCE_PATH:-../}
 
 # find all the manual pages in doc/tools
 TOOLS=`find "${SOURCE_PATH}/doc/tools" -name "*.1.xml" | sed -E -e "s|.*/([a-z0-9-]*).*|\1|" | grep -v goid-tool`
diff --git a/tests/test-pkcs11-tool-allowed-mechanisms.sh b/tests/test-pkcs11-tool-allowed-mechanisms.sh
index 0ab47681..60351c12 100755
--- a/tests/test-pkcs11-tool-allowed-mechanisms.sh
+++ b/tests/test-pkcs11-tool-allowed-mechanisms.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
+SOURCE_PATH=${SOURCE_PATH:-../}
 
-source common.sh
+source $SOURCE_PATH/tests/common.sh
 
 echo "======================================================="
 echo "Setup SoftHSM"
diff --git a/tests/test-pkcs11-tool-sign-verify.sh b/tests/test-pkcs11-tool-sign-verify.sh
index 8aff6877..a563841b 100755
--- a/tests/test-pkcs11-tool-sign-verify.sh
+++ b/tests/test-pkcs11-tool-sign-verify.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
+SOURCE_PATH=${SOURCE_PATH:-../}
 
-source common.sh
+source $SOURCE_PATH/tests/common.sh
 
 echo "======================================================="
 echo "Setup SoftHSM"
diff --git a/tests/test-pkcs11-tool-test-threads.sh b/tests/test-pkcs11-tool-test-threads.sh
index 7ec526e2..6b74eb36 100755
--- a/tests/test-pkcs11-tool-test-threads.sh
+++ b/tests/test-pkcs11-tool-test-threads.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
+SOURCE_PATH=${SOURCE_PATH:-../}
 
-source common.sh
+source $SOURCE_PATH/tests/common.sh
 
 echo "======================================================="
 echo "Setup SoftHSM"
diff --git a/tests/test-pkcs11-tool-test.sh b/tests/test-pkcs11-tool-test.sh
index d96e8668..015a87b5 100755
--- a/tests/test-pkcs11-tool-test.sh
+++ b/tests/test-pkcs11-tool-test.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
+SOURCE_PATH=${SOURCE_PATH:-../}
 
-source common.sh
+source $SOURCE_PATH/tests/common.sh
 
 echo "======================================================="
 echo "Setup SoftHSM"