]> www.infradead.org Git - users/willy/linux.git/commitdiff
selftests: ublk: don't show `modprobe` failure
authorMing Lei <ming.lei@redhat.com>
Thu, 20 Mar 2025 01:37:34 +0000 (09:37 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 20 Mar 2025 23:18:55 +0000 (17:18 -0600)
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>
tools/testing/selftests/ublk/test_common.sh

index 350380facd9ffd64beff819dcdf6e7d61613ac82..c86363c5cc7ea7ff54f192f12dde9fec2f5b7444 100755 (executable)
@@ -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: $*"
 }