From: Ming Lei <ming.lei@redhat.com>
Date: Thu, 20 Mar 2025 01:37:34 +0000 (+0800)
Subject: selftests: ublk: don't show `modprobe` failure
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fe2230d9216093c984f75594aee97811faa2d59e;p=users%2Fwilly%2Flinux.git

selftests: ublk: don't show `modprobe` failure

ublk_drv may be built-in, so don't show modprobe failure, and we
do check `/dev/ublk-control` for skipping test if ublk_drv isn't
enabled.

Reported-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250320013743.4167489-3-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/tools/testing/selftests/ublk/test_common.sh b/tools/testing/selftests/ublk/test_common.sh
index 350380facd9f..c86363c5cc7e 100755
--- a/tools/testing/selftests/ublk/test_common.sh
+++ b/tools/testing/selftests/ublk/test_common.sh
@@ -64,7 +64,7 @@ _check_root() {
 
 _remove_ublk_devices() {
 	${UBLK_PROG} del -a
-	modprobe -r ublk_drv
+	modprobe -r ublk_drv > /dev/null 2>&1
 }
 
 _get_ublk_dev_state() {
@@ -79,7 +79,7 @@ _prep_test() {
 	_check_root
 	local type=$1
 	shift 1
-	modprobe ublk_drv
+	modprobe ublk_drv > /dev/null 2>&1
 	[ "$UBLK_TEST_QUIET" -eq 0 ] && echo "ublk $type: $*"
 }