Skip to content

shellcheck: Fix shellcheck v0.11.0 issues detected in fsverity.test #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stefanberger wants to merge 1 commit into
base: next-testing
Choose a base branch
from
Open

shellcheck: Fix shellcheck v0.11.0 issues detected in fsverity.test #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion tests/kernel/fsverity.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ _require dd mkfs blkid e2fsck tune2fs evmctl setfattr

trap '_report_exit_and_cleanup _cleanup_env cleanup' SIGINT SIGTERM EXIT

# shellcheck disable=SC2329
cleanup() {
if [ -e "$TST_MNT" ]; then
if [ "$LOOPBACK_MOUNTED" -eq 1 ]; then
Expand Down Expand Up @@ -220,6 +221,7 @@ load_policy_rule() {
return 0
}

# shellcheck disable=SC2329
create_file() {
local test=$1
local type=$2
Expand All @@ -236,6 +238,7 @@ create_file() {
chmod a+x "$TST_FILE"
}

# shellcheck disable=SC2329
measure-verity() {
local test=$1
local verity="${2:-disabled}"
Expand Down Expand Up @@ -297,6 +300,7 @@ measure-verity() {
return "$error"
}

# shellcheck disable=SC2329
measure-ima() {
local test=$1
local digest_filename
Expand Down Expand Up @@ -375,7 +379,7 @@ if ! evmctl --help | grep -q veritysig ; then
exit "$SKIP"
fi

if [ "x$(id -u)" != "x0" ]; then
if [ "$(id -u)" != "0" ]; then
echo "${CYAN}SKIP: Must be root to execute this test${NORM}"
exit "$SKIP"
fi
Expand Down Expand Up @@ -403,6 +407,7 @@ create_loopback_file ext4

# Commit 989dc72511f7 ("ima: define a new template field named 'd-ngv2' and
# templates") introduced ima-ngv2 and ima-sigv2 in linux-5.19.
# shellcheck disable=SC2329
__skip() { return "$SKIP"; }

# IMA policy rule using the ima-ngv2 template
Expand Down
Loading