| From foo@baz Wed Aug 22 09:42:09 CEST 2018 |
| From: "Shuah Khan (Samsung OSG)" <shuah@kernel.org> |
| Date: Thu, 14 Jun 2018 16:56:13 -0600 |
| Subject: selftests: zram: return Kselftest Skip code for skipped tests |
| |
| From: "Shuah Khan (Samsung OSG)" <shuah@kernel.org> |
| |
| [ Upstream commit 685814466bf8398192cf855415a0bb2cefc1930e ] |
| |
| When zram 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. |
| |
| 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/zram/zram.sh | 5 ++++- |
| tools/testing/selftests/zram/zram_lib.sh | 5 ++++- |
| 2 files changed, 8 insertions(+), 2 deletions(-) |
| |
| --- a/tools/testing/selftests/zram/zram.sh |
| +++ b/tools/testing/selftests/zram/zram.sh |
| @@ -1,6 +1,9 @@ |
| #!/bin/bash |
| TCID="zram.sh" |
| |
| +# Kselftest framework requirement - SKIP code is 4. |
| +ksft_skip=4 |
| + |
| . ./zram_lib.sh |
| |
| run_zram () { |
| @@ -23,5 +26,5 @@ elif [ -b /dev/zram0 ]; then |
| else |
| echo "$TCID : No zram.ko module or /dev/zram0 device file not found" |
| echo "$TCID : CONFIG_ZRAM is not set" |
| - exit 1 |
| + exit $ksft_skip |
| fi |
| --- a/tools/testing/selftests/zram/zram_lib.sh |
| +++ b/tools/testing/selftests/zram/zram_lib.sh |
| @@ -18,6 +18,9 @@ MODULE=0 |
| dev_makeswap=-1 |
| dev_mounted=-1 |
| |
| +# Kselftest framework requirement - SKIP code is 4. |
| +ksft_skip=4 |
| + |
| trap INT |
| |
| check_prereqs() |
| @@ -27,7 +30,7 @@ check_prereqs() |
| |
| if [ $uid -ne 0 ]; then |
| echo $msg must be run as root >&2 |
| - exit 0 |
| + exit $ksft_skip |
| fi |
| } |
| |