From: Christoph Hellwig Date: Thu, 22 Jul 2021 07:38:29 +0000 (+0200) Subject: xfs/220: avoid failure when disabling quota accounting is not supported X-Git-Tag: v2022.05.01~322 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ba125c9cc98a9895bf360a9c6d11c46f37fe5b3;p=xfstests-dev.git xfs/220: avoid failure when disabling quota accounting is not supported Doing a proper _requires for quotaoff support is rather hard, as we need to test it on a specific file system. Instead just use sed to remove the warning and let the test case pass. Eventually it should just be removed entirely. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Eryu Guan --- diff --git a/tests/xfs/220 b/tests/xfs/220 index 8d955225..c847a0dc 100755 --- a/tests/xfs/220 +++ b/tests/xfs/220 @@ -54,7 +54,12 @@ _scratch_mount -o uquota # turn off quota and remove space allocated to the quota files # (this used to give wrong ENOSYS returns in 2.6.31) -xfs_quota -x -c off -c remove $SCRATCH_DEV +# +# The sed expression below replaces a notrun to cater for kernels that have +# removed the ability to disable quota accounting at runtime. On those +# kernel this test is rather useless, and in a few years we can drop it. +xfs_quota -x -c off -c remove $SCRATCH_DEV 2>&1 | \ + sed -e '/XFS_QUOTARM: Invalid argument/d' # and unmount again _scratch_unmount