[PATCH blktests 2/5] tests/nvmeof-mp/rc: run nvmeof-mp tests if we set multipath=N

[Yi Zhang]

On 11/24/20 11:26 AM, Bart Van Assche wrote:
> On 11/23/20 5:04 PM, Yi Zhang wrote:
>> To enable it, just do bellow step before we run it:
>> $ echo "options nvme_core multipath=N" >/etc/modprobe.d/nvme.conf
>>
>> Signed-off-by: Yi Zhang <yi.zhang at redhat.com>
>> ---
>>   tests/nvmeof-mp/rc | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/nvmeof-mp/rc b/tests/nvmeof-mp/rc
>> index d7a7c87..bc78f14 100755
>> --- a/tests/nvmeof-mp/rc
>> +++ b/tests/nvmeof-mp/rc
>> @@ -17,7 +17,7 @@ group_requires() {
>>   	# Since the nvmeof-mp tests are based on the dm-mpath driver, these
>>   	# tests are incompatible with the NVME_MULTIPATH kernel configuration
>>   	# option.
>> -	if _have_kernel_option NVME_MULTIPATH; then
>> +	if _have_kernel_option NVME_MULTIPATH && _have_module_param_value nvme_core multipath Y; then
>>   		SKIP_REASON="CONFIG_NVME_MULTIPATH has been set in .config"
>>   		return
>>   	fi
> Please set different SKIP_REASON string for each case such that it
> remains easy for a blktests user to figure out why these tests have been
> skipped.
Do you mean something like this, could you add more detail here, thanks.

diff --git a/tests/nvmeof-mp/rc b/tests/nvmeof-mp/rc
index d7a7c87..af700d9 100755
--- a/tests/nvmeof-mp/rc
+++ b/tests/nvmeof-mp/rc
@@ -16,9 +16,9 @@ group_requires() {

         # Since the nvmeof-mp tests are based on the dm-mpath driver, these
         # tests are incompatible with the NVME_MULTIPATH kernel 
configuration
-       # option.
-       if _have_kernel_option NVME_MULTIPATH; then
-               SKIP_REASON="CONFIG_NVME_MULTIPATH has been set in .config"
+       # option and nvme_core: multipath set with Y.
+       if _have_kernel_option NVME_MULTIPATH && 
_have_module_param_value nvme_core multipath Y; then
+               SKIP_REASON="CONFIG_NVME_MULTIPATH has been set in 
.config and nvme_core: multipath should be set with N"
                 return
         fi


> Thanks,
>
> Bart.
>
> _______________________________________________
> Linux-nvme mailing list
> Linux-nvme at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-nvme
>