[PATCH] generic/726,727: add missing _require_scratch_reflink

[PATCH] generic/726,727: add missing _require_scratch_reflink

[Christoph Hellwig]

These two tests require reflink functionality, add the correct
statement to ensure that.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/726 | 2 ++
 tests/generic/727 | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/generic/726 b/tests/generic/726
index f0d8df2e..77afe10c 100755
--- a/tests/generic/726
+++ b/tests/generic/726
@@ -19,6 +19,7 @@ _begin_fstest auto fiexchange swapext quick
 
 # Import common functions.
 . ./common/filter
+. ./common/reflink
 
 # real QA test starts here
 
@@ -28,6 +29,7 @@ _require_user
 _require_xfs_io_command swapext '-v vfs -a'
 _require_xfs_io_command startupdate
 _require_scratch
+_require_scratch_reflink
 
 _scratch_mkfs >> $seqres.full
 _scratch_mount
diff --git a/tests/generic/727 b/tests/generic/727
index 2cda49ea..1f9eebc5 100755
--- a/tests/generic/727
+++ b/tests/generic/727
@@ -20,6 +20,7 @@ _begin_fstest auto fiexchange swapext quick
 # Import common functions.
 . ./common/filter
 . ./common/attr
+. ./common/reflink
 
 # real QA test starts here
 
@@ -31,6 +32,7 @@ _require_command "$SETCAP_PROG" setcap
 _require_xfs_io_command swapext '-v vfs -a'
 _require_xfs_io_command startupdate
 _require_scratch
+_require_scratch_reflink
 _require_attrs security
 
 _scratch_mkfs >> $seqres.full
-- 
2.39.2

Re: [PATCH] generic/726,727: add missing _require_scratch_reflink

[Zorro Lang]

On Wed, Nov 08, 2023 at 04:24:28PM +0100, Christoph Hellwig wrote:
> These two tests require reflink functionality, add the correct
> statement to ensure that.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  tests/generic/726 | 2 ++
>  tests/generic/727 | 2 ++
>  2 files changed, 4 insertions(+)
> 
> diff --git a/tests/generic/726 b/tests/generic/726
> index f0d8df2e..77afe10c 100755
> --- a/tests/generic/726
> +++ b/tests/generic/726
> @@ -19,6 +19,7 @@ _begin_fstest auto fiexchange swapext quick
>  
>  # Import common functions.
>  . ./common/filter
> +. ./common/reflink
>  
>  # real QA test starts here
>  
> @@ -28,6 +29,7 @@ _require_user
>  _require_xfs_io_command swapext '-v vfs -a'
>  _require_xfs_io_command startupdate
>  _require_scratch
> +_require_scratch_reflink

Does the "startupdate" actually need reflink feature?

>  
>  _scratch_mkfs >> $seqres.full
>  _scratch_mount
> diff --git a/tests/generic/727 b/tests/generic/727
> index 2cda49ea..1f9eebc5 100755
> --- a/tests/generic/727
> +++ b/tests/generic/727
> @@ -20,6 +20,7 @@ _begin_fstest auto fiexchange swapext quick
>  # Import common functions.
>  . ./common/filter
>  . ./common/attr
> +. ./common/reflink
>  
>  # real QA test starts here
>  
> @@ -31,6 +32,7 @@ _require_command "$SETCAP_PROG" setcap
>  _require_xfs_io_command swapext '-v vfs -a'
>  _require_xfs_io_command startupdate
>  _require_scratch
> +_require_scratch_reflink
>  _require_attrs security
>  
>  _scratch_mkfs >> $seqres.full
> -- 
> 2.39.2
> 
> 

Re: [PATCH] generic/726,727: add missing _require_scratch_reflink

[Darrick J. Wong]

On Fri, Nov 17, 2023 at 10:51:55PM +0800, Zorro Lang wrote:
> On Wed, Nov 08, 2023 at 04:24:28PM +0100, Christoph Hellwig wrote:
> > These two tests require reflink functionality, add the correct
> > statement to ensure that.
> > 
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > ---
> >  tests/generic/726 | 2 ++
> >  tests/generic/727 | 2 ++
> >  2 files changed, 4 insertions(+)
> > 
> > diff --git a/tests/generic/726 b/tests/generic/726
> > index f0d8df2e..77afe10c 100755
> > --- a/tests/generic/726
> > +++ b/tests/generic/726
> > @@ -19,6 +19,7 @@ _begin_fstest auto fiexchange swapext quick
> >  
> >  # Import common functions.
> >  . ./common/filter
> > +. ./common/reflink
> >  
> >  # real QA test starts here
> >  
> > @@ -28,6 +29,7 @@ _require_user
> >  _require_xfs_io_command swapext '-v vfs -a'
> >  _require_xfs_io_command startupdate
> >  _require_scratch
> > +_require_scratch_reflink
> 
> Does the "startupdate" actually need reflink feature?

It does, but the -a switch to the _require_xfs_io_command swapext line
above will fail _notrun the test.  Or at least it would had I not
changed the CLI options when I gave up on getting FIEXCHANGE merged and
reworked it as an xfs-only ioctl.

IOWs, the "privatize the FIEXCHANGE" series should fix all these
problems for Christoph.

--D

> >  
> >  _scratch_mkfs >> $seqres.full
> >  _scratch_mount
> > diff --git a/tests/generic/727 b/tests/generic/727
> > index 2cda49ea..1f9eebc5 100755
> > --- a/tests/generic/727
> > +++ b/tests/generic/727
> > @@ -20,6 +20,7 @@ _begin_fstest auto fiexchange swapext quick
> >  # Import common functions.
> >  . ./common/filter
> >  . ./common/attr
> > +. ./common/reflink
> >  
> >  # real QA test starts here
> >  
> > @@ -31,6 +32,7 @@ _require_command "$SETCAP_PROG" setcap
> >  _require_xfs_io_command swapext '-v vfs -a'
> >  _require_xfs_io_command startupdate
> >  _require_scratch
> > +_require_scratch_reflink
> >  _require_attrs security
> >  
> >  _scratch_mkfs >> $seqres.full
> > -- 
> > 2.39.2
> > 
> > 
> 
> 

Re: [PATCH] generic/726,727: add missing _require_scratch_reflink

[Zorro Lang]

On Fri, Nov 17, 2023 at 02:09:45PM -0800, Darrick J. Wong wrote:
> On Fri, Nov 17, 2023 at 10:51:55PM +0800, Zorro Lang wrote:
> > On Wed, Nov 08, 2023 at 04:24:28PM +0100, Christoph Hellwig wrote:
> > > These two tests require reflink functionality, add the correct
> > > statement to ensure that.
> > > 
> > > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > > ---
> > >  tests/generic/726 | 2 ++
> > >  tests/generic/727 | 2 ++
> > >  2 files changed, 4 insertions(+)
> > > 
> > > diff --git a/tests/generic/726 b/tests/generic/726
> > > index f0d8df2e..77afe10c 100755
> > > --- a/tests/generic/726
> > > +++ b/tests/generic/726
> > > @@ -19,6 +19,7 @@ _begin_fstest auto fiexchange swapext quick
> > >  
> > >  # Import common functions.
> > >  . ./common/filter
> > > +. ./common/reflink
> > >  
> > >  # real QA test starts here
> > >  
> > > @@ -28,6 +29,7 @@ _require_user
> > >  _require_xfs_io_command swapext '-v vfs -a'
> > >  _require_xfs_io_command startupdate
> > >  _require_scratch
> > > +_require_scratch_reflink
> > 
> > Does the "startupdate" actually need reflink feature?
> 
> It does, but the -a switch to the _require_xfs_io_command swapext line
> above will fail _notrun the test.  Or at least it would had I not
> changed the CLI options when I gave up on getting FIEXCHANGE merged and
> reworked it as an xfs-only ioctl.
> 
> IOWs, the "privatize the FIEXCHANGE" series should fix all these
> problems for Christoph.

Thanks Darrick, I'll drop this patch temporarily (as I've merged your
"privatize the FIEXCHANGE" patch). Please reply to this patch again,
if this problem is still there after next release.

Thanks,
Zorro

> 
> --D
> 
> > >  
> > >  _scratch_mkfs >> $seqres.full
> > >  _scratch_mount
> > > diff --git a/tests/generic/727 b/tests/generic/727
> > > index 2cda49ea..1f9eebc5 100755
> > > --- a/tests/generic/727
> > > +++ b/tests/generic/727
> > > @@ -20,6 +20,7 @@ _begin_fstest auto fiexchange swapext quick
> > >  # Import common functions.
> > >  . ./common/filter
> > >  . ./common/attr
> > > +. ./common/reflink
> > >  
> > >  # real QA test starts here
> > >  
> > > @@ -31,6 +32,7 @@ _require_command "$SETCAP_PROG" setcap
> > >  _require_xfs_io_command swapext '-v vfs -a'
> > >  _require_xfs_io_command startupdate
> > >  _require_scratch
> > > +_require_scratch_reflink
> > >  _require_attrs security
> > >  
> > >  _scratch_mkfs >> $seqres.full
> > > -- 
> > > 2.39.2
> > > 
> > > 
> > 
> > 
>