diff mbox series

[blktests] check: add zoned sysfs node checking in _test_dev_is_zoned

Message ID 20190322081228.21898-1-yi.zhang@redhat.com (mailing list archive)
State New, archived
Headers show
Series [blktests] check: add zoned sysfs node checking in _test_dev_is_zoned | expand

Commit Message

Yi Zhang March 22, 2019, 8:12 a.m. UTC
Some kernel may not have zoned sysfs node, e.g. RHEL7, checking if
it exists first in _test_dev_is_zoned.

Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
---
 check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Shinichiro Kawasaki March 25, 2019, 12:26 p.m. UTC | #1
On 3/22/19 5:12 PM, Yi Zhang wrote:
> Some kernel may not have zoned sysfs node, e.g. RHEL7, checking if
> it exists first in _test_dev_is_zoned.
> 
> Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
> ---
>   check | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/check b/check
> index f0ca382..459104d 100755
> --- a/check
> +++ b/check
> @@ -405,7 +405,7 @@ _call_test() {
>   }
>   
>   _test_dev_is_zoned() {
> -	if grep -qe "none" "${TEST_DEV_SYSFS}/queue/zoned" ; then
> +	if [[ ! -f "${TEST_DEV_SYSFS}/queue/zoned" ]] || grep -qe "none" "${TEST_DEV_SYSFS}/queue/zoned" ; then
>   		SKIP_REASON="${TEST_DEV} is not a zoned block device"
>   		return 1
>   	fi

Hi Yi Zhang. This patch looks good for me.

I have prepared Debian oldstable environment with kernel 3.16, which does not 
support "zoned" sysfs attribute. With this kernel, test cases that has 
test_devices() function and does not have CAN_BE_ZONED=1 flag are skipped. This 
skip is not expected, and the patch avoids it.
Omar Sandoval March 25, 2019, 5:41 p.m. UTC | #2
On Fri, Mar 22, 2019 at 04:12:28PM +0800, Yi Zhang wrote:
> Some kernel may not have zoned sysfs node, e.g. RHEL7, checking if
> it exists first in _test_dev_is_zoned.
> 
> Signed-off-by: Yi Zhang <yi.zhang@redhat.com>

Applied, thanks.
diff mbox series

Patch

diff --git a/check b/check
index f0ca382..459104d 100755
--- a/check
+++ b/check
@@ -405,7 +405,7 @@  _call_test() {
 }
 
 _test_dev_is_zoned() {
-	if grep -qe "none" "${TEST_DEV_SYSFS}/queue/zoned" ; then
+	if [[ ! -f "${TEST_DEV_SYSFS}/queue/zoned" ]] || grep -qe "none" "${TEST_DEV_SYSFS}/queue/zoned" ; then
 		SKIP_REASON="${TEST_DEV} is not a zoned block device"
 		return 1
 	fi