When ublk_drv driver is not a loadable module but a built-in module,
modprobe for the driver fails in _init_ublk. This results in unexpected
test case skips with the message "requires ublk_drv".
To not skip the test cases with built-in ublk_drv, call modprobe only
when the driver is loadable and its module file exists. Also, do not set
SKIP_REASONS to handle modprobe failure as test case failure.
Fixes: 840ccf1fc33e ("block/033: add test to cover gendisk leak")
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@xxxxxxx>
---
common/ublk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/common/ublk b/common/ublk
index 198c4db..8278d56 100644
--- a/common/ublk
+++ b/common/ublk
@@ -27,8 +27,7 @@ _init_ublk() {
_remove_ublk_devices > /dev/null 2>&1
modprobe -rq ublk_drv
- if ! modprobe ublk_drv; then
- SKIP_REASONS+=("requires ublk_drv")
+ if _module_file_exists ublk_drv && ! modprobe ublk_drv; then
return 1
fi
--
2.40.1
