selftests/kexec: define common logging functions

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>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/testing/selftests/kexec/kexec_common_lib.sh b/tools/testing/selftests/kexec/kexec_common_lib.sh
index 05376be6a6f7988e29e56827aa89d80c45270e82..347a0d1714500e1ca7295f901d08fcc952f83239 100755 (executable)
--- a/tools/testing/selftests/kexec/kexec_common_lib.sh
+++ b/tools/testing/selftests/kexec/kexec_common_lib.sh
@@ -1,5 +1,35 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
+#
+# 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
+}
 
 # Check efivar SecureBoot-$(the UUID) and SetupMode-$(the UUID).
 # The secure boot mode can be accessed either as the last integer

diff --git a/tools/testing/selftests/kexec/test_kexec_load.sh b/tools/testing/selftests/kexec/test_kexec_load.sh
index 86625c3f1e5d24b2e9d4ff35a01cc29b76209f99..cbf598a380d255a014abb710290b96eabc85d46c 100755 (executable)
--- a/tools/testing/selftests/kexec/test_kexec_load.sh
+++ b/tools/testing/selftests/kexec/test_kexec_load.sh
@@ -6,15 +6,10 @@
 
 TEST="$0"
 . ./kexec_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"
 fi
 
 get_secureboot_mode
@@ -26,18 +21,14 @@ kexec --load $KERNEL_IMAGE > /dev/null 2>&1
 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