Address issues raised by shellcheck SC2034:
"foo appears unused. Verify it or export it."
Export PKCS11_KEYURI in a separate statement to avoid the following
shellcheck issue:
SC2155 (warning): Declare and assign separately to avoid masking
return values.
Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxxxxx>
---
tests/Makefile.am | 2 +-
tests/functions.sh | 1 +
tests/mmap_check.test | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e2fcb16..79e2775 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,7 @@ clean-local:
distclean: distclean-keys
shellcheck:
- shellcheck -i SC2086,SC2181,SC2046,SC2320,SC2317 \
+ shellcheck -i SC2086,SC2181,SC2046,SC2320,SC2317,SC2034 \
functions.sh gen-keys.sh install-fsverity.sh \
install-mount-idmapped.sh install-openssl3.sh \
install-swtpm.sh install-tss.sh softhsm_setup \
diff --git a/tests/functions.sh b/tests/functions.sh
index 9670b3a..4ad61ef 100755
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -371,6 +371,7 @@ _softhsm_setup() {
if msg=$(./softhsm_setup setup 2>&1); then
echo "softhsm_setup setup succeeded: $msg"
PKCS11_KEYURI=$(echo "$msg" | sed -n 's|^keyuri: \(.*\)|\1|p')
+ export PKCS11_KEYURI
export EVMCTL_ENGINE="--engine pkcs11"
export OPENSSL_ENGINE="-engine pkcs11"
diff --git a/tests/mmap_check.test b/tests/mmap_check.test
index e3e5c71..18412b5 100755
--- a/tests/mmap_check.test
+++ b/tests/mmap_check.test
@@ -5,6 +5,8 @@
#
# Check the behavior of MMAP_CHECK and MMAP_CHECK_REQPROT
+# shellcheck disable=SC2034
+
trap '_report_exit_and_cleanup _cleanup_env cleanup' SIGINT SIGTERM SIGSEGV EXIT
PATCHES=(
--
2.43.0
