selftests: firmware: fix verify_reqs() return value

BugLink: https://bugs.launchpad.net/bugs/1819515
commit 344c0152d878922365464b7140c74c2a5e073d99 upstream.

commit a6a9be9270c87 ("selftests: firmware: return Kselftest Skip code
for skipped tests") by Shuah modified failures to return the special
error code of $ksft_skip (4). We have a corner case issue where we
*do* want to verify_reqs().

Cc: <stable@vger.kernel.org> # >= 4.18
Fixes: a6a9be9270c87 ("selftests: firmware: return Kselftest Skip code for for skipped tests")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/tools/testing/selftests/firmware/fw_lib.sh b/tools/testing/selftests/firmware/fw_lib.sh
index 6c5f1b2ffb74598a79eaf0cc4316cee8b74a5ef9..1cbb12e284a689329feb78eeddfa8896cc21f3a5 100755 (executable)
--- a/tools/testing/selftests/firmware/fw_lib.sh
+++ b/tools/testing/selftests/firmware/fw_lib.sh
@@ -91,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 $ksft_skip
+                       exit 0
                fi
        fi
 }