diff mbox series

[blktests,7/9] block/001: allow to run with built-in scsi_debug and sd_mod

Message ID 20230417125913.458726-3-shinichiro@fastmail.com (mailing list archive)
State New, archived
Headers show
Series support built-in scsi_debug | expand

Commit Message

Shin'ichiro Kawasaki April 17, 2023, 12:59 p.m. UTC 
From: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

To allow the test case run with build-in scsi_debug, replace
'_have_module scsi_debug' with _have_scsi_debug, and replace
_init_scsi_debug with _configure_scsi_debug.

Also, to allow the test case run with build-in sd_mod, replace
'_have_module sd_mod' with '_have_kernel_option BLK_DEV_SD'. When sd_mod
driver is built-in, /sys/module/sd_mod directory is not created. Then
_have_driver() can not detect availability of the driver. Instead, refer
the kernel config to check availability of the driver.

Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
---
 tests/block/001 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Chaitanya Kulkarni April 18, 2023, 8:20 p.m. UTC | #1 
On 4/17/23 05:59, Shin'ichiro Kawasaki wrote:
> From: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
>
> To allow the test case run with build-in scsi_debug, replace
> '_have_module scsi_debug' with _have_scsi_debug, and replace
> _init_scsi_debug with _configure_scsi_debug.
>
> Also, to allow the test case run with build-in sd_mod, replace
> '_have_module sd_mod' with '_have_kernel_option BLK_DEV_SD'. When sd_mod
> driver is built-in, /sys/module/sd_mod directory is not created. Then
> _have_driver() can not detect availability of the driver. Instead, refer
> the kernel config to check availability of the driver.
>
> Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
> ---
>

Looks good.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>

-ck
diff mbox series

Patch

diff --git a/tests/block/001 b/tests/block/001
index 2ea3754..32dd22f 100755
--- a/tests/block/001
+++ b/tests/block/001
@@ -13,13 +13,13 @@  DESCRIPTION="stress device hotplugging"
 TIMED=1
 
 requires() {
-	_have_module scsi_debug
-	_have_driver sd_mod
+	_have_scsi_debug
+	_have_kernel_option BLK_DEV_SD
 	_have_driver sr_mod
 }
 
 stress_scsi_debug() {
-	if ! _init_scsi_debug "$@"; then
+	if ! _configure_scsi_debug "$@"; then
 		return
 	fi