| From foo@baz Wed Aug 22 09:42:09 CEST 2018 |
| From: "Shuah Khan (Samsung OSG)" <shuah@kernel.org> |
| Date: Tue, 12 Jun 2018 17:40:31 -0600 |
| Subject: selftests: static_keys: return Kselftest Skip code for skipped tests |
| |
| From: "Shuah Khan (Samsung OSG)" <shuah@kernel.org> |
| |
| [ Upstream commit 8781578087b8fb8829558bac96c3c24e5ba26f82 ] |
| |
| When static_keys test is skipped because of unmet dependencies and/or |
| unsupported configuration, it exits with error which is treated as a fail |
| by the Kselftest framework. This leads to false negative 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. |
| |
| Added an explicit searches for test_static_key_base and test_static_keys |
| modules and return skip code if they aren't found to differentiate between |
| the failure to load the module condition and module not found condition. |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/testing/selftests/static_keys/test_static_keys.sh | 13 +++++++++++++ |
| 1 file changed, 13 insertions(+) |
| |
| --- a/tools/testing/selftests/static_keys/test_static_keys.sh |
| +++ b/tools/testing/selftests/static_keys/test_static_keys.sh |
| @@ -1,6 +1,19 @@ |
| #!/bin/sh |
| # Runs static keys kernel module tests |
| |
| +# Kselftest framework requirement - SKIP code is 4. |
| +ksft_skip=4 |
| + |
| +if ! /sbin/modprobe -q -n test_static_key_base; then |
| + echo "static_key: module test_static_key_base is not found [SKIP]" |
| + exit $ksft_skip |
| +fi |
| + |
| +if ! /sbin/modprobe -q -n test_static_keys; then |
| + echo "static_key: module test_static_keys is not found [SKIP]" |
| + exit $ksft_skip |
| +fi |
| + |
| if /sbin/modprobe -q test_static_key_base; then |
| if /sbin/modprobe -q test_static_keys; then |
| echo "static_key: ok" |