[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1466121559-22363-4-git-send-email-mcgrof@kernel.org>
Date: Thu, 16 Jun 2016 16:59:14 -0700
From: "Luis R. Rodriguez" <mcgrof@...nel.org>
To: ming.lei@...onical.com, akpm@...ux-foundation.org, mmarek@...e.com,
gregkh@...uxfoundation.org, bp@...en8.de, chunkeey@...glemail.com
Cc: linux-kernel@...r.kernel.org, markivx@...eaurora.org,
stephen.boyd@...aro.org, zohar@...ux.vnet.ibm.com,
broonie@...nel.org, tiwai@...e.de, johannes@...solutions.net,
hauke@...ke-m.de, jwboyer@...oraproject.org,
dmitry.torokhov@...il.com, dwmw2@...radead.org, jslaby@...e.com,
torvalds@...ux-foundation.org, luto@...capital.net,
fengguang.wu@...el.com, rpurdie@...ys.net, ki@...sung.com,
Abhay_Salunke@...l.com, Julia.Lawall@...6.fr,
Gilles.Muller@...6.fr, nicolas.palix@...g.fr, teg@...m.no,
dhowells@...hat.com, keescook@...omium.org, tj@...nel.org,
daniel.vetter@...ll.ch, corbet@....net,
"Luis R. Rodriguez" <mcgrof@...nel.org>
Subject: [PATCH v2 3/8] selftests: firmware: only modprobe if driver is missing
No need to load test_firmware if its already there.
Signed-off-by: Luis R. Rodriguez <mcgrof@...nel.org>
---
tools/testing/selftests/firmware/fw_filesystem.sh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/firmware/fw_filesystem.sh b/tools/testing/selftests/firmware/fw_filesystem.sh
index 5c495ad7958a..3ff573dc6009 100755
--- a/tools/testing/selftests/firmware/fw_filesystem.sh
+++ b/tools/testing/selftests/firmware/fw_filesystem.sh
@@ -5,10 +5,17 @@
# 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
+if [ ! -d $DIR ]; then
+ modprobe test_firmware
+ if [ ! -d $DIR ]; then
+ echo "$0: $DIR not present"
+ echo "You must have CONFIG_TEST_FIRMWARE=m or CONFIG_TEST_FIRMWARE=y"
+ exit 1
+ fi
+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
# as an indicator for CONFIG_FW_LOADER_USER_HELPER.
--
2.8.2
Powered by blists - more mailing lists