From: Stefan Berger <stefanb@linux.ibm.com>
To: linux-integrity@vger.kernel.org
Cc: zohar@linux.ibm.com, Stefan Berger <stefanb@linux.ibm.com>
Subject: [ima-evm-utils PATCH v2 06/14] tests: Address issues raised by shellcheck SC2034
Date: Tue, 28 Nov 2023 13:16:04 -0500 [thread overview]
Message-ID: <20231128181613.1159958-7-stefanb@linux.ibm.com> (raw)
In-Reply-To: <20231128181613.1159958-1-stefanb@linux.ibm.com>
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@linux.ibm.com>
---
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
next prev parent reply other threads:[~2023-11-28 18:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-28 18:15 [ima-evm-utils PATCH v2 00/14] Enable shellcheck and fix some issues Stefan Berger
2023-11-28 18:15 ` [ima-evm-utils PATCH v2 01/14] tests: Address issues raised by shellcheck SC2086 & enable shellcheck Stefan Berger
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 02/14] tests: Address issues raised by shellcheck SC2181 Stefan Berger
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 03/14] tests: Address issues raised by shellcheck SC2046 Stefan Berger
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 04/14] tests: Address issues raised by shellcheck SC2320 Stefan Berger
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 05/14] tests: Address issues raised by shellcheck SC2317 Stefan Berger
2023-11-28 18:16 ` Stefan Berger [this message]
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 07/14] tests: Address issues raised by shellcheck SC2164 Stefan Berger
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 08/14] tests: Address issues raised by shellcheck SC2166 Stefan Berger
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 09/14] tests: Address issues raised by shellcheck SC2294 Stefan Berger
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 10/14] tests: Address issues raised by shellcheck SC2206 Stefan Berger
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 11/14] tests: Address issues raised by shellcheck SC2196 Stefan Berger
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 12/14] tests: Address issues raised by shellcheck SC2043 Stefan Berger
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 13/14] tests: Address issues raised by shellcheck SC2295 Stefan Berger
2023-11-28 18:16 ` [ima-evm-utils PATCH v2 14/14] tests: Address issues raised by shellcheck SC2003 Stefan Berger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231128181613.1159958-7-stefanb@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=linux-integrity@vger.kernel.org \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox