tests: Remove unnecessary '&&' in requires() functions

zhijianli88 · kawasaki · commit 50af4ac28c0d · 2025-01-17T18:21:34.000+09:00
The '&amp;&amp;' operator should only be used when the second operand
is dependent on the first. In the context of requires() functions,
we prefer to evaluate all conditions independently to display
all SKIP_REASONS at once. This change separates the conditions
into individual lines to ensure each condition is evaluated
regardless of the others.

After this patch, there are a few '&amp;&amp;' remain
$ git grep -wl 'requires()' | xargs -I {} sed -n '/^requires() *{/,/}/p' {} | grep '&amp;&amp;'
        _have_null_blk &amp;&amp; _have_module_param null_blk blocking
        _have_null_blk &amp;&amp; _have_module_param null_blk shared_tags
        _have_null_blk &amp;&amp; _have_module_param null_blk timeout
        _have_null_blk &amp;&amp; _have_module_param null_blk requeue
        _have_null_blk &amp;&amp; _have_module_param null_blk shared_tags
        _have_null_blk &amp;&amp; _have_module_param null_blk init_hctx
        _have_module nvme_tcp &amp;&amp; _have_module_param nvme_tcp ddp_offload
        _have_program mkfs.btrfs &amp;&amp; have_good_mkfs_btrfs

Signed-off-by: Li Zhijian &lt;lizhijian@fujitsu.com&gt;
Signed-off-by: Shin'ichiro Kawasaki &lt;shinichiro.kawasaki@wdc.com&gt;
diff --git a/tests/block/006 b/tests/block/006
@@ -15,7 +15,8 @@ TIMED=1
 CAN_BE_ZONED=1
 
 requires() {
-	_have_null_blk && _have_module_param null_blk blocking && _have_fio
+	_have_null_blk && _have_module_param null_blk blocking
+	_have_fio
 }
 
 test() {
diff --git a/tests/block/008 b/tests/block/008
@@ -12,7 +12,8 @@ TIMED=1
 CAN_BE_ZONED=1
 
 requires() {
-	_have_cpu_hotplug && _have_fio
+	_have_cpu_hotplug
+	_have_fio
 }
 
 test_device() {
diff --git a/tests/block/010 b/tests/block/010
@@ -15,7 +15,8 @@ TIMED=1
 CAN_BE_ZONED=1
 
 requires() {
-	_have_null_blk && _have_module_param null_blk shared_tags && _have_fio
+	_have_null_blk && _have_module_param null_blk shared_tags
+	_have_fio
 }
 
 run_fio_job() {
diff --git a/tests/block/011 b/tests/block/011
@@ -24,7 +24,8 @@ pci_dev_mounted() {
 }
 
 requires() {
-	_have_fio && _have_program setpci
+	_have_fio
+	_have_program setpci
 }
 
 device_requires() {
diff --git a/tests/block/019 b/tests/block/019
@@ -11,7 +11,8 @@ QUICK=1
 CAN_BE_ZONED=1
 
 requires() {
-	_have_fio && _have_program setpci
+	_have_fio
+	_have_program setpci
 }
 
 device_requires() {
diff --git a/tests/block/020 b/tests/block/020
@@ -14,7 +14,8 @@ QUICK=1
 CAN_BE_ZONED=1
 
 requires() {
-	_have_null_blk && _have_fio
+	_have_null_blk
+	_have_fio
 }
 
 test() {
diff --git a/tests/block/029 b/tests/block/029
@@ -11,7 +11,8 @@ DESCRIPTION="trigger blk_mq_update_nr_hw_queues()"
 QUICK=1
 
 requires() {
-	_have_fio && _have_null_blk
+	_have_fio
+	_have_null_blk
 }
 
 modify_nr_hw_queues() {
diff --git a/tests/loop/002 b/tests/loop/002
@@ -15,7 +15,9 @@ DESCRIPTION="try various loop device block sizes"
 QUICK=1
 
 requires() {
-	_have_program xfs_io && _have_src_program loblksize && _have_loop_set_block_size
+	_have_program xfs_io
+	_have_src_program loblksize
+	_have_loop_set_block_size
 }
 
 test() {
diff --git a/tests/nbd/001 b/tests/nbd/001
@@ -11,7 +11,9 @@ DESCRIPTION="resize a connected nbd device"
 QUICK=1
 
 requires() {
-	_have_nbd && _have_program parted && _have_src_program nbdsetsize
+	_have_nbd
+	_have_program parted
+	_have_src_program nbdsetsize
 }
 
 test() {
diff --git a/tests/nbd/002 b/tests/nbd/002
@@ -17,7 +17,8 @@ DESCRIPTION="tests on partition handling for an nbd device"
 QUICK=1
 
 requires() {
-	_have_nbd_netlink && _have_program parted
+	_have_nbd_netlink
+	_have_program parted
 }
 
 test() {
diff --git a/tests/nbd/003 b/tests/nbd/003
@@ -11,7 +11,8 @@ DESCRIPTION="mount/unmount concurrently with NBD_CLEAR_SOCK"
 QUICK=1
 
 requires() {
-	_have_nbd && _have_src_program mount_clear_sock
+	_have_nbd
+	_have_src_program mount_clear_sock
 }
 
 test() {
diff --git a/tests/nvme/005 b/tests/nvme/005
@@ -12,7 +12,8 @@ QUICK=1
 
 requires() {
 	_nvme_requires
-	_have_loop && _have_module_param_value nvme_core multipath Y
+	_have_loop
+	_have_module_param_value nvme_core multipath Y
 	_require_nvme_trtype_is_fabrics
 }
 
diff --git a/tests/nvme/010 b/tests/nvme/010
@@ -11,7 +11,8 @@ TIMED=1
 
 requires() {
 	_nvme_requires
-	_have_fio && _have_loop
+	_have_fio
+	_have_loop
 	_require_nvme_trtype_is_fabrics
 }
 
diff --git a/tests/nvme/039 b/tests/nvme/039
@@ -14,8 +14,8 @@ QUICK=1
 
 requires() {
 	_have_program nvme
-	_have_kernel_option FAULT_INJECTION && \
-	    _have_kernel_option FAULT_INJECTION_DEBUG_FS
+	_have_kernel_option FAULT_INJECTION
+	_have_kernel_option FAULT_INJECTION_DEBUG_FS
 }
 
 device_requires() {
diff --git a/tests/nvme/056 b/tests/nvme/056
@@ -30,7 +30,9 @@ requires() {
 	_have_fio
 	_have_program ip
 	_have_program ethtool
-	_have_kernel_source && _have_program python3 && have_netlink_cli
+	_have_kernel_source
+	_have_program python3
+	have_netlink_cli
 	have_iface
 }
 
diff --git a/tests/scsi/001 b/tests/scsi/001
@@ -11,7 +11,8 @@ DESCRIPTION="try triggering a kernel GPF with 0 byte SG reads"
 QUICK=1
 
 requires() {
-	_have_scsi_generic && _have_src_program sg/syzkaller1
+	_have_scsi_generic
+	_have_src_program sg/syzkaller1
 }
 
 test_device() {
diff --git a/tests/scsi/002 b/tests/scsi/002
@@ -11,7 +11,8 @@ DESCRIPTION="perform a SG_DXFER_FROM_DEV from the /dev/sg read-write interface"
 QUICK=1
 
 requires() {
-	_have_scsi_generic && _have_src_program sg/dxfer-from-dev
+	_have_scsi_generic
+	_have_src_program sg/dxfer-from-dev
 }
 
 test_device() {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ TIMED=1`
`15`	`15`	`CAN_BE_ZONED=1`
`16`	`16`
`17`	`17`	`requires() {`
`18`		`- _have_null_blk && _have_module_param null_blk blocking && _have_fio`
	`18`	`+ _have_null_blk && _have_module_param null_blk blocking`
	`19`	`+ _have_fio`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`test() {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ TIMED=1`
`12`	`12`	`CAN_BE_ZONED=1`
`13`	`13`
`14`	`14`	`requires() {`
`15`		`- _have_cpu_hotplug && _have_fio`
	`15`	`+ _have_cpu_hotplug`
	`16`	`+ _have_fio`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`test_device() {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ pci_dev_mounted() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`requires() {`
`27`		`- _have_fio && _have_program setpci`
	`27`	`+ _have_fio`
	`28`	`+ _have_program setpci`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`device_requires() {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ QUICK=1`
`11`	`11`	`CAN_BE_ZONED=1`
`12`	`12`
`13`	`13`	`requires() {`
`14`		`- _have_fio && _have_program setpci`
	`14`	`+ _have_fio`
	`15`	`+ _have_program setpci`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`device_requires() {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ QUICK=1`
`14`	`14`	`CAN_BE_ZONED=1`
`15`	`15`
`16`	`16`	`requires() {`
`17`		`- _have_null_blk && _have_fio`
	`17`	`+ _have_null_blk`
	`18`	`+ _have_fio`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`test() {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ DESCRIPTION="trigger blk_mq_update_nr_hw_queues()"`
`11`	`11`	`QUICK=1`
`12`	`12`
`13`	`13`	`requires() {`
`14`		`- _have_fio && _have_null_blk`
	`14`	`+ _have_fio`
	`15`	`+ _have_null_blk`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`modify_nr_hw_queues() {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@ DESCRIPTION="try various loop device block sizes"`
`15`	`15`	`QUICK=1`
`16`	`16`
`17`	`17`	`requires() {`
`18`		`- _have_program xfs_io && _have_src_program loblksize && _have_loop_set_block_size`
	`18`	`+ _have_program xfs_io`
	`19`	`+ _have_src_program loblksize`
	`20`	`+ _have_loop_set_block_size`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`test() {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@ DESCRIPTION="resize a connected nbd device"`
`11`	`11`	`QUICK=1`
`12`	`12`
`13`	`13`	`requires() {`
`14`		`- _have_nbd && _have_program parted && _have_src_program nbdsetsize`
	`14`	`+ _have_nbd`
	`15`	`+ _have_program parted`
	`16`	`+ _have_src_program nbdsetsize`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`test() {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ DESCRIPTION="tests on partition handling for an nbd device"`
`17`	`17`	`QUICK=1`
`18`	`18`
`19`	`19`	`requires() {`
`20`		`- _have_nbd_netlink && _have_program parted`
	`20`	`+ _have_nbd_netlink`
	`21`	`+ _have_program parted`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`test() {`