diff options
| author | Luis R. Rodriguez | 2015-07-25 00:10:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-08-06 02:07:19 +0200 |
| commit | 1d0fbb3467b5a82e33ab57f27b870c1b8275f45d (patch) | |
| tree | 5a13e5a913b192f416e4b176e2af2bef9293e175 /tools/testing/selftests/firmware/fw_userhelper.sh | |
| parent | kernel, cpu: Remove bogus __ref annotations (diff) | |
| download | kernel-qcow2-linux-1d0fbb3467b5a82e33ab57f27b870c1b8275f45d.tar.gz kernel-qcow2-linux-1d0fbb3467b5a82e33ab57f27b870c1b8275f45d.tar.xz kernel-qcow2-linux-1d0fbb3467b5a82e33ab57f27b870c1b8275f45d.zip | |
selftests: firmware: skip timeout checks for kernels without user mode helper
The CONFIG_FW_LOADER_USER_HELPER is mostly disabled these days, so skip
timeout setting for these kernels.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/firmware/fw_userhelper.sh')
| -rwxr-xr-x | tools/testing/selftests/firmware/fw_userhelper.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tools/testing/selftests/firmware/fw_userhelper.sh b/tools/testing/selftests/firmware/fw_userhelper.sh index 6efbade12139..b9983f8e09f6 100755 --- a/tools/testing/selftests/firmware/fw_userhelper.sh +++ b/tools/testing/selftests/firmware/fw_userhelper.sh @@ -9,7 +9,17 @@ modprobe test_firmware DIR=/sys/devices/virtual/misc/test_firmware -OLD_TIMEOUT=$(cat /sys/class/firmware/timeout) +# CONFIG_FW_LOADER_USER_HELPER has a sysfs class under /sys/class/firmware/ +# These days no one enables CONFIG_FW_LOADER_USER_HELPER so check for that +# as an indicator for CONFIG_FW_LOADER_USER_HELPER. +HAS_FW_LOADER_USER_HELPER=$(if [ -d /sys/class/firmware/ ]; then echo yes; else echo no; fi) + +if [ "$HAS_FW_LOADER_USER_HELPER" = "yes" ]; then + OLD_TIMEOUT=$(cat /sys/class/firmware/timeout) +else + echo "usermode helper disabled so ignoring test" + exit 0 +fi FWPATH=$(mktemp -d) FW="$FWPATH/test-firmware.bin" |