From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755097AbcFQAB3 (ORCPT ); Thu, 16 Jun 2016 20:01:29 -0400 Received: from mail.kernel.org ([198.145.29.136]:41386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754533AbcFPX7d (ORCPT ); Thu, 16 Jun 2016 19:59:33 -0400 From: "Luis R. Rodriguez" To: ming.lei@canonical.com, akpm@linux-foundation.org, mmarek@suse.com, gregkh@linuxfoundation.org, bp@alien8.de, chunkeey@googlemail.com Cc: linux-kernel@vger.kernel.org, markivx@codeaurora.org, stephen.boyd@linaro.org, zohar@linux.vnet.ibm.com, broonie@kernel.org, tiwai@suse.de, johannes@sipsolutions.net, hauke@hauke-m.de, jwboyer@fedoraproject.org, dmitry.torokhov@gmail.com, dwmw2@infradead.org, jslaby@suse.com, torvalds@linux-foundation.org, luto@amacapital.net, fengguang.wu@intel.com, rpurdie@rpsys.net, ki@samsung.com, Abhay_Salunke@dell.com, Julia.Lawall@lip6.fr, Gilles.Muller@lip6.fr, nicolas.palix@imag.fr, teg@jklm.no, dhowells@redhat.com, keescook@chromium.org, tj@kernel.org, daniel.vetter@ffwll.ch, corbet@lwn.net, "Luis R. Rodriguez" Subject: [PATCH v2 3/8] selftests: firmware: only modprobe if driver is missing Date: Thu, 16 Jun 2016 16:59:14 -0700 Message-Id: <1466121559-22363-4-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1466121559-22363-1-git-send-email-mcgrof@kernel.org> References: <1466121559-22363-1-git-send-email-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No need to load test_firmware if its already there. Signed-off-by: Luis R. Rodriguez --- 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