On Wed, Nov 08, 2023 at 04:24:01PM +0100, Christoph Hellwig wrote: > The xfs_io command (only in Darricks trees and not upstream yet) > supports the -v switch to select the swapext version. When the selected > swapext version is not supported it reports a 'version must be $foo' > message. Parse that and don't _notfun the test cases. Er... which _require_xfs_io_command call fails? The only patch that adds 'version must' adds both '-v swapext' and '-v exchrange', and AFAICT all tests use one or the other if they specify a -v at all. --D > This fixes various generic tests trying to use the vfs version that > doesn't exist in most branches implementing the swapext command. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- > common/rc | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/common/rc b/common/rc > index 26a26085..d8a0b19b 100644 > --- a/common/rc > +++ b/common/rc > @@ -2706,6 +2706,8 @@ _require_xfs_io_command() > _notrun "xfs_io $command $param ioctl support is missing" > echo $testio | grep -q "Operation not supported" && \ > _notrun "xfs_io $command $param kernel support is missing" > + echo $testio | grep -q "version must" && \ > + _notrun "xfs_io $command $param kernel support is missing" > rm -f $testfile.1 > param_checked="$param" > ;; > -- > 2.39.2 > >
