[PATCH v2 1/5] selftests: firmware: only modprobe if driver is missing

From	"Luis R. Rodriguez" <mcgrof@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH v2 1/5] selftests: firmware: only modprobe if driver is missing
Date	2016-12-16 12:20 +0100
Message-ID	<sOYIq-2PB-7@gated-at.bofh.it> (permalink)
References	<sOYIp-2PB-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---
 tools/testing/selftests/firmware/fw_filesystem.sh | 19 +++++++++++++++++--
 1 file 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
-- 
2.10.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v2 1/5] selftests: firmware: only modprobe if driver is missing "Luis R. Rodriguez" <mcgrof@kernel.org> - 2016-12-16 12:20 +0100

csiph-web