All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: fstests@vger.kernel.org
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 4/6] xfs/220: avoid failure when disabling quota accounting is not supported
Date: Mon, 12 Jul 2021 13:11:44 +0200	[thread overview]
Message-ID: <20210712111146.82734-5-hch@lst.de> (raw)
In-Reply-To: <20210712111146.82734-1-hch@lst.de>

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 <hch@lst.de>
---
 tests/xfs/220 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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
-- 
2.30.2


  parent reply	other threads:[~2021-07-12 11:13 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-12 11:11 prepare for removing support to disable quota accounting Christoph Hellwig
2021-07-12 11:11 ` [PATCH 1/6] common/quota: allow removing quota options entirely in _qmount_option Christoph Hellwig
2021-07-14 23:35   ` Darrick J. Wong
2021-07-12 11:11 ` [PATCH 2/6] xfs/007: unmount after disabling quota Christoph Hellwig
2021-07-14 23:35   ` Darrick J. Wong
2021-07-12 11:11 ` [PATCH 3/6] xfs/106: don't test disabling quota accounting Christoph Hellwig
2021-07-14 23:37   ` Darrick J. Wong
2021-07-12 11:11 ` Christoph Hellwig [this message]
2021-07-14 23:30   ` [PATCH 4/6] xfs/220: avoid failure when disabling quota accounting is not supported Darrick J. Wong
2021-07-20  6:37     ` Christoph Hellwig
2021-07-12 11:11 ` [PATCH 5/6] xfs/304: don't turn quota accounting off Christoph Hellwig
2021-07-14 23:29   ` Darrick J. Wong
2021-07-12 11:11 ` [PATCH 6/6] xfs/305: " Christoph Hellwig
2021-07-14 23:28   ` Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210712111146.82734-5-hch@lst.de \
    --to=hch@lst.de \
    --cc=fstests@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.