From: Petr Vorel <pvorel@suse.cz>
To: Mimi Zohar <zohar@linux.ibm.com>
Cc: linux-kselftest@vger.kernel.org, Shuah Khan <shuah@kernel.org>,
linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 3/5] selftests/ima: define common logging functions
Date: Thu, 28 Feb 2019 21:18:07 +0100 [thread overview]
Message-ID: <20190228201807.GB20335@dell5510> (raw)
In-Reply-To: <1551223620-11586-4-git-send-email-zohar@linux.ibm.com>
Hi Mimi,
> Define log_info, log_pass, log_fail, and log_skip functions.
> Suggested-by: Petr Vorel <pvorel@suse.cz>
> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
> ---
> tools/testing/selftests/ima/common_lib.sh | 43 +++++++++++++++++++++++---
> tools/testing/selftests/ima/test_kexec_load.sh | 19 +++---------
> 2 files changed, 43 insertions(+), 19 deletions(-)
> diff --git a/tools/testing/selftests/ima/common_lib.sh b/tools/testing/selftests/ima/common_lib.sh
> index 5583ea74c14e..c6d04006281d 100755
> --- a/tools/testing/selftests/ima/common_lib.sh
> +++ b/tools/testing/selftests/ima/common_lib.sh
> @@ -1,5 +1,36 @@
> #!/bin/sh
> # SPDX-License-Identifier: GPL-2.0-or-later
> +#
> +# Kselftest framework defines: ksft_pass=0, ksft_fail=1, ksft_skip=4
> +
> +VERBOSE="${VERBOSE:-1}"
> +
> +log_info()
> +{
> + [ $VERBOSE -ne 0 ] && echo "[INFO] $1"
> +}
> +
> +# The ksefltest framework requirement returns 0 for PASS.
> +log_pass()
> +{
> +
> + [ $VERBOSE -ne 0 ] && echo "$1 [PASS]"
> + exit 0
> +}
> +
> +# The ksefltest framework requirement returns 1 for FAIL.
> +log_fail()
> +{
> + [ $VERBOSE -ne 0 ] && echo "$1 [FAIL]"
> + exit 1
> +}
> +
> +# The ksefltest framework requirement returns 4 for SKIP.
> +log_skip()
> +{
> + [ $VERBOSE -ne 0 ] && echo "$1"
> + exit 4
> +}
These might be good candidates for moving to selftest specific shell helper
library (for somebody who wants to do this work).
> # The secure boot mode can be accessed either as the last integer
> # of "od -An -t u1 /sys/firmware/efi/efivars/SecureBoot-*" or from
> @@ -8,17 +39,19 @@
> get_secureboot_mode()
> {
> local efivarfs="/sys/firmware/efi/efivars"
> +
> # Make sure that efivars is mounted in the normal location
> if ! grep -q "^\S\+ $efivarfs efivarfs" /proc/mounts; then
> - echo "$TEST: efivars is not mounted on $efivarfs" >&2
> - exit $ksft_skip
> + log_skip "efivars is not mounted on $efivarfs"
> fi
> # Get secureboot mode
> local file="$efivarfs/../vars/SecureBoot-*/data"
> if [ ! -e $file ]; then
> - echo "$TEST: unknown secureboot mode" >&2
> - exit $ksft_skip
> + log_skip "unknown secureboot mode"
> fi
> - return `od -An -t u1 /sys/firmware/efi/vars/SecureBoot-*/data`
> + ret=`od -An -t u1 /sys/firmware/efi/vars/SecureBoot-*/data`
> + [ $ret -eq 1 ] && log_info "secure boot mode enabled"
> +
> + return $ret
> }
> diff --git a/tools/testing/selftests/ima/test_kexec_load.sh b/tools/testing/selftests/ima/test_kexec_load.sh
> index 35934e0665f1..8b99017538ba 100755
> --- a/tools/testing/selftests/ima/test_kexec_load.sh
> +++ b/tools/testing/selftests/ima/test_kexec_load.sh
> @@ -6,15 +6,10 @@
> TEST="$0"
> . ./common_lib.sh
> -rc=0
> -
> -# Kselftest framework requirement - SKIP code is 4.
> -ksft_skip=4
> # kexec requires root privileges
> if [ $(id -ru) -ne 0 ]; then
> - echo "$TEST: requires root privileges" >&2
> - exit $ksft_skip
> + log_skip "requires root privileges" >&2
You left here redirection to stderr.
+ again requiring root could be in helper library.
> fi
> get_secureboot_mode
> @@ -26,18 +21,14 @@ kexec --load $KERNEL_IMAGE 2>&1 > /dev/null
> if [ $? -eq 0 ]; then
> kexec --unload
> if [ $secureboot -eq 1 ]; then
> - echo "$TEST: kexec_load succeeded [FAIL]"
> - rc=1
> + log_fail "kexec_load succeeded"
> else
> - echo "$TEST: kexec_load succeeded [PASS]"
> + log_pass "kexec_load succeeded"
> fi
> else
> if [ $secureboot -eq 1 ]; then
> - echo "$TEST: kexec_load failed [PASS]"
> + log_pass "kexec_load failed"
> else
> - echo "$TEST: kexec_load failed [FAIL]"
> - rc=1
> + log_fail "kexec_load failed"
> fi
> fi
> -
> -exit $rc
Kind regards,
Petr
next prev parent reply other threads:[~2019-02-28 20:18 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 23:26 [PATCH v2 0/5] selftests/ima: add kexec and kernel module tests Mimi Zohar
2019-02-26 23:26 ` [PATCH v2 1/5] selftests/ima: cleanup the kexec selftest Mimi Zohar
2019-02-27 0:57 ` shuah
2019-02-26 23:26 ` [PATCH v2 2/5] selftests/ima: define a set of common functions Mimi Zohar
2019-02-27 1:01 ` shuah
2019-02-28 19:54 ` Petr Vorel
2019-02-26 23:26 ` [PATCH v2 3/5] selftests/ima: define common logging functions Mimi Zohar
2019-02-27 1:39 ` shuah
2019-02-28 20:18 ` Petr Vorel [this message]
2019-02-28 21:01 ` Petr Vorel
2019-02-26 23:26 ` [PATCH v2 4/5] selftests/ima: kexec_file_load syscall test Mimi Zohar
2019-02-27 1:54 ` shuah
2019-02-28 22:00 ` Petr Vorel
2019-03-10 17:48 ` Mimi Zohar
2019-03-11 8:34 ` Petr Vorel
2019-03-11 11:49 ` Mimi Zohar
2019-02-28 22:20 ` Petr Vorel
2019-02-26 23:27 ` [PATCH v2 5/5] selftests/ima: loading kernel modules Mimi Zohar
2019-02-27 1:59 ` shuah
2019-02-27 14:14 ` Mimi Zohar
2019-02-27 15:33 ` shuah
2019-02-27 18:37 ` Mimi Zohar
2019-02-28 23:14 ` Petr Vorel
2019-02-28 22:32 ` Petr Vorel
2019-03-10 17:48 ` Mimi Zohar
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=20190228201807.GB20335@dell5510 \
--to=pvorel@suse.cz \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@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;
as well as URLs for NNTP newsgroup(s).