diff mbox series

common/rc: add _filter_scratch in _test_inode_flag

Message ID 20201123062526.18465-1-xifeng@redhat.com (mailing list archive)
State New, archived
Headers show
Series common/rc: add _filter_scratch in _test_inode_flag | expand

Commit Message

XiaoLi Feng Nov. 23, 2020, 6:25 a.m. UTC 
From: Xiaoli Feng <xifeng@redhat.com>

Avoid the invalid failure when the path of file include test flag.

Signed-off-by: Xiaoli Feng <xifeng@redhat.com>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eryu Guan Nov. 29, 2020, 8:12 a.m. UTC | #1 
On Mon, Nov 23, 2020 at 02:25:26PM +0800, Xiaoli Feng wrote:
> From: Xiaoli Feng <xifeng@redhat.com>
> 
> Avoid the invalid failure when the path of file include test flag.
> 
> Signed-off-by: Xiaoli Feng <xifeng@redhat.com>

Would you please elaborate this issue in more details? It seems your
SCRATCH_MNT contains a string that matches $flag so _test_inode_flag
returns a false positive. But that only fixes SCRATCH_MNT, what if
TEST_DIR contains the string as well?

Thanks,
Eryu

> ---
>  common/rc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/rc b/common/rc
> index b5a504e0..04080331 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -3069,7 +3069,7 @@ _test_inode_flag()
>  	local flag=$1
>  	local file=$2
>  
> -	if $XFS_IO_PROG -r -c 'lsattr -v' "$file" | grep -q "$flag" ; then
> +	if $XFS_IO_PROG -r -c 'lsattr -v' "$file" | _filter_scratch | grep -q "$flag" ; then
>  		return 0
>  	fi
>  	return 1
> -- 
> 2.18.1
XiaoLi Feng Dec. 1, 2020, 4:04 p.m. UTC | #2 
Hi,

----- Original Message -----
> From: "Eryu Guan" <guan@eryu.me>
> To: "XiaoLi Feng" <xifeng@redhat.com>
> Cc: fstests@vger.kernel.org
> Sent: Sunday, November 29, 2020 4:12:34 PM
> Subject: Re: [PATCH] common/rc: add _filter_scratch in _test_inode_flag
> 
> On Mon, Nov 23, 2020 at 02:25:26PM +0800, Xiaoli Feng wrote:
> > From: Xiaoli Feng <xifeng@redhat.com>
> > 
> > Avoid the invalid failure when the path of file include test flag.
> > 
> > Signed-off-by: Xiaoli Feng <xifeng@redhat.com>
> 
> Would you please elaborate this issue in more details? It seems your
> SCRATCH_MNT contains a string that matches $flag so _test_inode_flag
> returns a false positive. But that only fixes SCRATCH_MNT, what if
> TEST_DIR contains the string as well?

When test generic/608 for dax on xfs, "_check_xflag $t_file 0" is always 
failed if the $f_file has dax string. Yes, here should also include filter
for TEST_DIR.

> 
> Thanks,
> Eryu
> 
> > ---
> >  common/rc | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/common/rc b/common/rc
> > index b5a504e0..04080331 100644
> > --- a/common/rc
> > +++ b/common/rc
> > @@ -3069,7 +3069,7 @@ _test_inode_flag()
> >  	local flag=$1
> >  	local file=$2
> >  
> > -	if $XFS_IO_PROG -r -c 'lsattr -v' "$file" | grep -q "$flag" ; then
> > +	if $XFS_IO_PROG -r -c 'lsattr -v' "$file" | _filter_scratch | grep -q
> > "$flag" ; then
> >  		return 0
> >  	fi
> >  	return 1
> > --
> > 2.18.1
> 
>
diff mbox series

Patch

diff --git a/common/rc b/common/rc
index b5a504e0..04080331 100644
--- a/common/rc
+++ b/common/rc
@@ -3069,7 +3069,7 @@  _test_inode_flag()
 	local flag=$1
 	local file=$2
 
-	if $XFS_IO_PROG -r -c 'lsattr -v' "$file" | grep -q "$flag" ; then
+	if $XFS_IO_PROG -r -c 'lsattr -v' "$file" | _filter_scratch | grep -q "$flag" ; then
 		return 0
 	fi
 	return 1