| Message ID | 20190910113611.31247-1-zlang@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | generic/566: use _require_xfs_quota_foreign to replace the hard -f option | expand |
On Wed, Sep 11, 2019 at 10:19:10AM +0800, Xu, Yang/徐 杨 wrote: > on 2019/09/10 19:36, Zorro Lang wrote: > > > xfstests should decide if xfs_quota need the -f option by > > _require_xfs_quota_foreign, not write the -f option after > > $XFS_QUOTA_PROG manually. The later way will cause unexpected > > error on an old system which xfsprogs doesn't support the -f option. > > > Hi Zorro > > I also sent a patch[1] about _require_xfs_quota_foreign but i miss > $XFS_QUOTA_PROG have used -f option for non-xfs filesystem. > And you may forget to modify the last $XFS_QUOTA_PRO. As below: > > $XFS_QUOTA_PROG -x -f -c 'report -hag' $SCRATCH_MNT >> $seqres.full > > [1]https://patchwork.kernel.org/patch/11137635/ Oh, I didn't notice that, we sent the patch nearly same time. As you've sent a patch, you can keep working on that, ignore this patch. But the '-f' options in the case must be removed, or the case will fail on RHEL-7 XFS. Due rhel7 xfsprogs doesn't support -f option, but _require_xfs_quota_foreign won't _notrun if the FSTYP is xfs. Thanks, Zorro > > Thanks > Yang Xu > > > > > Signed-off-by: Zorro Lang <zlang@redhat.com> > > --- > > tests/generic/566 | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/tests/generic/566 b/tests/generic/566 > > index e8491e54..fb239a00 100755 > > --- a/tests/generic/566 > > +++ b/tests/generic/566 > > @@ -34,6 +34,7 @@ _supported_os Linux > > _supported_fs generic > > _require_scratch > > _require_quota > > +_require_xfs_quota_foreign > > _require_user > > rm -f $seqres.full > > @@ -45,7 +46,7 @@ _qmount > > dir="$SCRATCH_MNT/dummy" > > mkdir -p $dir > > chown $qa_user $dir > > -$XFS_QUOTA_PROG -x -f -c "limit -g bsoft=100k bhard=100k $qa_user" $SCRATCH_MNT > > +$XFS_QUOTA_PROG -x -c "limit -g bsoft=100k bhard=100k $qa_user" $SCRATCH_MNT > > $XFS_IO_PROG -f -c 'pwrite -S 0x58 0 1m' $dir/foo >> $seqres.full > > chown $qa_user "${dir}/foo" > >
diff --git a/tests/generic/566 b/tests/generic/566 index e8491e54..fb239a00 100755 --- a/tests/generic/566 +++ b/tests/generic/566 @@ -34,6 +34,7 @@ _supported_os Linux _supported_fs generic _require_scratch _require_quota +_require_xfs_quota_foreign _require_user rm -f $seqres.full @@ -45,7 +46,7 @@ _qmount dir="$SCRATCH_MNT/dummy" mkdir -p $dir chown $qa_user $dir -$XFS_QUOTA_PROG -x -f -c "limit -g bsoft=100k bhard=100k $qa_user" $SCRATCH_MNT +$XFS_QUOTA_PROG -x -c "limit -g bsoft=100k bhard=100k $qa_user" $SCRATCH_MNT $XFS_IO_PROG -f -c 'pwrite -S 0x58 0 1m' $dir/foo >> $seqres.full chown $qa_user "${dir}/foo"
xfstests should decide if xfs_quota need the -f option by _require_xfs_quota_foreign, not write the -f option after $XFS_QUOTA_PROG manually. The later way will cause unexpected error on an old system which xfsprogs doesn't support the -f option. Signed-off-by: Zorro Lang <zlang@redhat.com> --- tests/generic/566 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)