public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Shuah Khan (Samsung OSG)" <shuah@kernel.org>
To: shuah@kernel.org, gregkh@linuxfoundation.org, mcgrof@kernel.org,
	keescook@chromium.org, tglx@linutronix.de,
	sumit.semwal@linaro.org, amit.pundir@linaro.org,
	ben.hutchings@codethink.co.uk
Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 08/24] selftests: firmware: return Kselftest Skip code for skipped tests
Date: Fri,  4 May 2018 19:13:12 -0600	[thread overview]
Message-ID: <20180505011328.32078-8-shuah@kernel.org> (raw)
In-Reply-To: <20180505011328.32078-1-shuah@kernel.org>

When firmware test(s) get skipped because of unmet dependencies and/or
unsupported configuration, it returns 0 which is treated as a pass
by the Kselftest framework. This leads to false positive result even
when the test could not be run.

Change it to return kselftest skip code when a test gets skipped to
clearly report that the test could not be run.

Kselftest framework SKIP code is 4 and the framework prints appropriate
messages to indicate that the test is skipped.

Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
---
 tools/testing/selftests/firmware/fw_fallback.sh   | 4 ++--
 tools/testing/selftests/firmware/fw_filesystem.sh | 4 +++-
 tools/testing/selftests/firmware/fw_lib.sh        | 7 +++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/firmware/fw_fallback.sh b/tools/testing/selftests/firmware/fw_fallback.sh
index 8e2e34a2ca69..70d18be46af5 100755
--- a/tools/testing/selftests/firmware/fw_fallback.sh
+++ b/tools/testing/selftests/firmware/fw_fallback.sh
@@ -74,7 +74,7 @@ load_fw_custom()
 {
 	if [ ! -e "$DIR"/trigger_custom_fallback ]; then
 		echo "$0: custom fallback trigger not present, ignoring test" >&2
-		return 1
+		exit $ksft_skip
 	fi
 
 	local name="$1"
@@ -107,7 +107,7 @@ load_fw_custom_cancel()
 {
 	if [ ! -e "$DIR"/trigger_custom_fallback ]; then
 		echo "$0: canceling custom fallback trigger not present, ignoring test" >&2
-		return 1
+		exit $ksft_skip
 	fi
 
 	local name="$1"
diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh
index 6452d2129cd9..a4320c4b44dc 100755
--- a/tools/testing/selftests/firmware/fw_filesystem.sh
+++ b/tools/testing/selftests/firmware/fw_filesystem.sh
@@ -30,6 +30,7 @@ fi
 
 if [ ! -e "$DIR"/trigger_async_request ]; then
 	echo "$0: empty filename: async trigger not present, ignoring test" >&2
+	exit $ksft_skip
 else
 	if printf '\000' >"$DIR"/trigger_async_request 2> /dev/null; then
 		echo "$0: empty filename should not succeed (async)" >&2
@@ -69,6 +70,7 @@ fi
 # Try the asynchronous version too
 if [ ! -e "$DIR"/trigger_async_request ]; then
 	echo "$0: firmware loading: async trigger not present, ignoring test" >&2
+	exit $ksft_skip
 else
 	if ! echo -n "$NAME" >"$DIR"/trigger_async_request ; then
 		echo "$0: could not trigger async request" >&2
@@ -89,7 +91,7 @@ test_config_present()
 {
 	if [ ! -f $DIR/reset ]; then
 		echo "Configuration triggers not present, ignoring test"
-		exit 0
+		exit $ksft_skip
 	fi
 }
 
diff --git a/tools/testing/selftests/firmware/fw_lib.sh b/tools/testing/selftests/firmware/fw_lib.sh
index 962d7f4ac627..6c5f1b2ffb74 100755
--- a/tools/testing/selftests/firmware/fw_lib.sh
+++ b/tools/testing/selftests/firmware/fw_lib.sh
@@ -9,11 +9,14 @@ DIR=/sys/devices/virtual/misc/test_firmware
 PROC_CONFIG="/proc/config.gz"
 TEST_DIR=$(dirname $0)
 
+# Kselftest framework requirement - SKIP code is 4.
+ksft_skip=4
+
 print_reqs_exit()
 {
 	echo "You must have the following enabled in your kernel:" >&2
 	cat $TEST_DIR/config >&2
-	exit 1
+	exit $ksft_skip
 }
 
 test_modprobe()
@@ -88,7 +91,7 @@ verify_reqs()
 	if [ "$TEST_REQS_FW_SYSFS_FALLBACK" = "yes" ]; then
 		if [ ! "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then
 			echo "usermode helper disabled so ignoring test"
-			exit 0
+			exit $ksft_skip
 		fi
 	fi
 }
-- 
2.14.1

  parent reply	other threads:[~2018-05-05  1:13 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-05  1:13 [PATCH 01/24] selftests: android: ion: return Kselftest Skip code for skipped tests Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 02/24] selftests: breakpoints: " Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 03/24] selftests: cpu-hotplug: " Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 04/24] selftests: cpufreq: " Shuah Khan (Samsung OSG)
2018-05-07  5:01   ` Viresh Kumar
2018-05-05  1:13 ` [PATCH 05/24] selftests: efivarfs: " Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 06/24] selftests: exec: " Shuah Khan (Samsung OSG)
2018-05-08  0:03   ` Steve Muckle
2018-05-05  1:13 ` [PATCH 07/24] selftests: filesystems: " Shuah Khan (Samsung OSG)
2018-05-06  8:15   ` Christian Brauner
2018-05-05  1:13 ` Shuah Khan (Samsung OSG) [this message]
2018-05-09 19:27   ` [PATCH 08/24] selftests: firmware: " Luis R. Rodriguez
2018-05-05  1:13 ` [PATCH 09/24] selftests: ftrace: " Shuah Khan (Samsung OSG)
2018-05-07 15:17   ` Steven Rostedt
2018-05-08  3:29     ` Masami Hiramatsu
2018-05-08  3:38   ` Masami Hiramatsu
2018-05-10 20:18     ` Shuah Khan
2018-05-11  6:09       ` Masami Hiramatsu
2018-05-05  1:13 ` [PATCH 10/24] selftests: gpio: " Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 11/24] selftests: intel_pstate: " Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 12/24] selftests: ipc: " Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 13/24] selftests: kmod: " Shuah Khan (Samsung OSG)
2018-05-09 19:28   ` Luis R. Rodriguez
2018-05-05  1:13 ` [PATCH 14/24] selftests: kvm: " Shuah Khan (Samsung OSG)
2018-05-07 11:46   ` Paolo Bonzini
2018-05-07 19:41     ` Shuah Khan
2018-05-07 20:19       ` Shuah Khan
2018-05-05  1:13 ` [PATCH 15/24] selftests: lib: add prime_numbers.sh test to Makefile Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 16/24] selftests: lib: return Kselftest Skip code for skipped tests Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 17/24] selftests: locking: add Makefile for locking test Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 18/24] selftests: locking: return Kselftest Skip code for skipped tests Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 19/24] selftests: media_tests: " Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 20/24] selftests: membarrier: " Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 21/24] selftests: memfd: " Shuah Khan (Samsung OSG)
2018-05-05  1:52   ` Mike Kravetz
2018-05-07 18:45     ` Shuah Khan
2018-05-07 21:16       ` Shuah Khan
2018-05-05  1:13 ` [PATCH 22/24] selftests: memory-hotplug: " Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 23/24] selftests: mqueue: " Shuah Khan (Samsung OSG)
2018-05-05  1:13 ` [PATCH 24/24] selftests: net: " Shuah Khan (Samsung OSG)
2018-05-07 11:04 ` [PATCH 01/24] selftests: android: ion: " Pintu Kumar

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=20180505011328.32078-8-shuah@kernel.org \
    --to=shuah@kernel.org \
    --cc=amit.pundir@linaro.org \
    --cc=ben.hutchings@codethink.co.uk \
    --cc=gregkh@linuxfoundation.org \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=mcgrof@kernel.org \
    --cc=sumit.semwal@linaro.org \
    --cc=tglx@linutronix.de \
    /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