2024-02-07 14:56:46

by Lukas Bulwahn

Subject: [PATCH] scsi: core: really include kunit tests with SCSI_LIB_KUNIT_TEST

Commit 25a1f7a0a1fe ("scsi: core: Add kunit tests for
scsi_check_passthrough()") adds the config SCSI_LIB_KUNIT_TEST and
corresponding tests. Due to naming confusion, the actual tests would only
be included when the non-existing config SCSI_KUNIT_TEST is enabled (note
this missing 'LIB' in the config name). So, they are basically dead right
now.

Adjust the name to actual existing config.

Signed-off-by: Lukas Bulwahn <[email protected]>
---
drivers/scsi/scsi_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 23719b903259..0315a0dc3406 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -3428,6 +3428,6 @@ void scsi_build_sense(struct scsi_cmnd *scmd, int desc, u8 key, u8 asc, u8 ascq)
}
EXPORT_SYMBOL_GPL(scsi_build_sense);

-#ifdef CONFIG_SCSI_KUNIT_TEST
+#ifdef CONFIG_SCSI_LIB_KUNIT_TEST
#include "scsi_lib_test.c"
#endif
--
2.17.1

2024-02-07 15:37:56

by Mike Christie

Subject: Re: [PATCH] scsi: core: really include kunit tests with SCSI_LIB_KUNIT_TEST

On 2/7/24 8:56 AM, Lukas Bulwahn wrote:
> Commit 25a1f7a0a1fe ("scsi: core: Add kunit tests for
> scsi_check_passthrough()") adds the config SCSI_LIB_KUNIT_TEST and
> corresponding tests. Due to naming confusion, the actual tests would only
> be included when the non-existing config SCSI_KUNIT_TEST is enabled (note
> this missing 'LIB' in the config name). So, they are basically dead right
> now.
>
> Adjust the name to actual existing config.
>
> Signed-off-by: Lukas Bulwahn <[email protected]>
> ---
> drivers/scsi/scsi_lib.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index 23719b903259..0315a0dc3406 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -3428,6 +3428,6 @@ void scsi_build_sense(struct scsi_cmnd *scmd, int desc, u8 key, u8 asc, u8 ascq)
> }
> EXPORT_SYMBOL_GPL(scsi_build_sense);
>
> -#ifdef CONFIG_SCSI_KUNIT_TEST
> +#ifdef CONFIG_SCSI_LIB_KUNIT_TEST
> #include "scsi_lib_test.c"
> #endif

I tried to sneak a rename in last minute and messed that up. Thanks.

Reviewed-by: Mike Christie <[email protected]>

2024-02-13 01:51:17

by Martin K. Petersen

Subject: Re: [PATCH] scsi: core: really include kunit tests with SCSI_LIB_KUNIT_TEST

Lukas,

> Commit 25a1f7a0a1fe ("scsi: core: Add kunit tests for
> scsi_check_passthrough()") adds the config SCSI_LIB_KUNIT_TEST and
> corresponding tests. Due to naming confusion, the actual tests would only
> be included when the non-existing config SCSI_KUNIT_TEST is enabled (note
> this missing 'LIB' in the config name). So, they are basically dead right
> now.
>
> Adjust the name to actual existing config.

Applied to 6.9/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering