diff options
| author | Luis R. Rodriguez <mcgrof@kernel.org> | 2016-12-16 03:10:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-11 09:42:59 +0100 |
| commit | f5786313f091a19eff934d1074642906c71c0c66 (patch) | |
| tree | 72b1cd669addbc19915daf3a808f25452f7e63bf /tools/testing | |
| parent | 8a18f4284ec94ec56189e7f14495359d3b892a52 (diff) | |
| download | linux-f5786313f091a19eff934d1074642906c71c0c66.tar.gz linux-f5786313f091a19eff934d1074642906c71c0c66.tar.bz2 linux-f5786313f091a19eff934d1074642906c71c0c66.zip | |
selftests: firmware: only modprobe if driver is missing
No need to load test_firmware if its already there.
Also use a more generic form to recommend what is required
to be built.
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing')
| -rwxr-xr-x | tools/testing/selftests/firmware/fw_filesystem.sh | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh index 5c495ad7958a..c8ccdaa78479 100755 --- a/tools/testing/selftests/firmware/fw_filesystem.sh +++ b/tools/testing/selftests/firmware/fw_filesystem.sh @@ -5,9 +5,24 @@ # know so we can be sure we're not accidentally testing the user helper. set -e -modprobe test_firmware - DIR=/sys/devices/virtual/misc/test_firmware +TEST_DIR=$(dirname $0) + +test_modprobe() +{ + if [ ! -d $DIR ]; then + echo "$0: $DIR not present" + echo "You must have the following enabled in your kernel:" + cat $TEST_DIR/config + exit 1 + fi +} + +trap "test_modprobe" EXIT + +if [ ! -d $DIR ]; then + modprobe test_firmware +fi # 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 |