From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: guaneryu@gmail.com, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org
Subject: [PATCH 2/7] misc: force the exact quota options coded into the test
Date: Tue, 03 Jul 2018 21:51:00 -0700 [thread overview]
Message-ID: <153067986006.28393.12507727179398690195.stgit@magnolia> (raw)
In-Reply-To: <153067984748.28393.1595618163831671652.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Several tests require setting exactly the quota mount options that are
encoded in the test. Unfortunately, quota mount options set by the user
in MOUNT_OPTIONS can turn on other quota types, which causes the golden
outputs to be off for various reasons (quota report output, behavior
changes, etc.)
So use _qmount_option to delete all the quota mount options in these
tests so that the test itself can run with exactly the config for which
it was written.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
tests/generic/230 | 3 +++
tests/xfs/075 | 4 ++++
tests/xfs/116 | 3 +++
tests/xfs/132 | 5 +++++
tests/xfs/220 | 3 +++
5 files changed, 18 insertions(+)
diff --git a/tests/generic/230 b/tests/generic/230
index bc8c1ad0..a7ab67f7 100755
--- a/tests/generic/230
+++ b/tests/generic/230
@@ -99,6 +99,9 @@ rm -f $seqres.full
grace=2
+# Test only the quota type specified in each _scratch_mount clause below.
+_qmount_option 'defaults'
+
_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount "-o usrquota,grpquota"
quotacheck -u -g $SCRATCH_MNT 2>/dev/null
diff --git a/tests/xfs/075 b/tests/xfs/075
index caf612bb..dee01462 100755
--- a/tests/xfs/075
+++ b/tests/xfs/075
@@ -25,12 +25,16 @@ _cleanup()
# get standard environment, filters and checks
. ./common/rc
. ./common/filter
+. ./common/quota
# real QA test starts here
_supported_fs xfs
_supported_os Linux
_require_scratch
+# norecovery mounts do not succeed with quotas eanbled, so shut them off
+_qmount_option "defaults"
+
echo "Silence is golden"
_scratch_mkfs_sized $((512 * 1024 * 1024)) >$seqres.full
diff --git a/tests/xfs/116 b/tests/xfs/116
index 6887d7e5..4422eb50 100755
--- a/tests/xfs/116
+++ b/tests/xfs/116
@@ -36,6 +36,9 @@ _supported_os Linux
_require_scratch
_require_xfs_quota
+# Only mount with the quota options we specify below
+_qmount_option "defaults"
+
_scratch_mkfs >/dev/null 2>&1
_scratch_mount "-o uquota"
_scratch_unmount
diff --git a/tests/xfs/132 b/tests/xfs/132
index c5fe8b5a..a421f727 100755
--- a/tests/xfs/132
+++ b/tests/xfs/132
@@ -24,6 +24,7 @@ _cleanup()
# get standard environment, filters and checks
. ./common/rc
. ./common/filter
+. ./common/quota
# remove previous $seqres.full before test
rm -f $seqres.full
@@ -43,6 +44,10 @@ _disable_dmesg_check
_require_xfs_mkfs_crc
_scratch_mkfs -m crc=0 > $seqres.full 2>&1
+# The files that EIO in the golden output changes if we have quotas enabled
+# so leave it off.
+_qmount_option "defaults"
+
# corrupt an inode in the root inode chunk
root_ino=$(_scratch_xfs_get_metadata_field 'rootino' 'sb 0')
corrupt_ino=$((root_ino + 15))
diff --git a/tests/xfs/220 b/tests/xfs/220
index 227d5452..61319c9d 100755
--- a/tests/xfs/220
+++ b/tests/xfs/220
@@ -36,6 +36,9 @@ _supported_os Linux
_require_scratch
_require_quota
+# Only mount with the specific quota options mentioned below
+_qmount_option "defaults"
+
echo "Silence is golden."
# create scratch filesystem
next prev parent reply other threads:[~2018-07-04 4:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-04 4:50 [PATCH 0/7] fstests: fix quota failures on xfs Darrick J. Wong
2018-07-04 4:50 ` [PATCH 1/7] generic/{279, 28[1-3]}: hide SIGBUS reporting from golden output Darrick J. Wong
2018-07-04 4:51 ` Darrick J. Wong [this message]
2018-07-14 10:14 ` [PATCH 2/7] misc: force the exact quota options coded into the test Eryu Guan
2018-07-04 4:51 ` [PATCH 3/7] xfs/001: update to handle v5 filesystems Darrick J. Wong
2018-07-04 4:51 ` [PATCH 4/7] xfs: filter out mount options that don't work on v4 filesystems Darrick J. Wong
2018-07-14 11:41 ` Eryu Guan
2018-11-01 22:51 ` Darrick J. Wong
2018-07-04 4:51 ` [PATCH 5/7] xfs/288: update for v5 filesystem support in xfs_db Darrick J. Wong
2018-07-04 4:51 ` [PATCH 6/7] generic/338: don't check fs after crashing it Darrick J. Wong
2018-07-04 4:51 ` [PATCH 7/7] misc: filter out quota regeneration messages Darrick J. Wong
2018-07-14 11:49 ` [PATCH 0/7] fstests: fix quota failures on xfs Eryu Guan
2018-07-16 14: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=153067986006.28393.12507727179398690195.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=fstests@vger.kernel.org \
--cc=guaneryu@gmail.com \
--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.