fstests.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Xiao Yang <ice_yangxiao@163.com>
To: fstests@vger.kernel.org
Cc: darrick.wong@oracle.com, ira.weiny@intel.com,
	ross.zwisler@linux.intel.com, Xiao Yang <yangx.jy@cn.fujitsu.com>
Subject: [PATCH v2 2/6] fstests: Use _require_scratch_dax_mountopt() and _require_scratch_dax_iflag()
Date: Wed, 17 Jun 2020 17:32:00 +0800	[thread overview]
Message-ID: <20200617093204.20838-3-ice_yangxiao@163.com> (raw)
In-Reply-To: <20200617093204.20838-1-ice_yangxiao@163.com>

From: Xiao Yang <yangx.jy@cn.fujitsu.com>

Make related tests use _require_scratch_dax_mountopt() and _require_scratch_dax_iflag()

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 tests/ext4/030    | 2 +-
 tests/ext4/031    | 4 ++--
 tests/generic/413 | 2 +-
 tests/generic/462 | 2 +-
 tests/xfs/260     | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/ext4/030 b/tests/ext4/030
index 93bbca86..fb5cf451 100755
--- a/tests/ext4/030
+++ b/tests/ext4/030
@@ -33,7 +33,7 @@ rm -f $seqres.full
 # Modify as appropriate.
 _supported_os Linux
 _supported_fs ext4
-_require_scratch_dax
+_require_scratch_dax_mountopt "dax"
 _require_test_program "t_ext4_dax_journal_corruption"
 _require_command "$CHATTR_PROG" chattr
 
diff --git a/tests/ext4/031 b/tests/ext4/031
index dc58214e..20e2fab7 100755
--- a/tests/ext4/031
+++ b/tests/ext4/031
@@ -37,7 +37,7 @@ MOUNT_OPTIONS=""
 # Modify as appropriate.
 _supported_os Linux
 _supported_fs ext4
-_require_scratch_dax
+_require_scratch_dax_mountopt "dax"
 _require_test_program "t_ext4_dax_inline_corruption"
 _require_scratch_ext4_feature "inline_data"
 
@@ -56,7 +56,7 @@ _scratch_unmount >> $seqres.full 2>&1
 _try_scratch_mount "-o dax" >> $seqres.full 2>&1
 
 if [[ $? != 0 ]]; then
-	# _require_scratch_dax already verified that we could mount with DAX.
+	# _require_scratch_dax_mountopt already verified that we could mount with DAX.
 	# Failure here is expected because we have inline data.
 	echo "Silence is golden"
 	status=0
diff --git a/tests/generic/413 b/tests/generic/413
index 1ce89aff..19e1b926 100755
--- a/tests/generic/413
+++ b/tests/generic/413
@@ -31,7 +31,7 @@ rm -f $seqres.full
 _supported_fs generic
 _supported_os Linux
 _require_test
-_require_scratch_dax
+_require_scratch_dax_mountopt "dax"
 _require_test_program "feature"
 _require_test_program "t_mmap_dio"
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/462 b/tests/generic/462
index 1ab6cadc..4a940239 100755
--- a/tests/generic/462
+++ b/tests/generic/462
@@ -37,7 +37,7 @@ rm -f $seqres.full
 _supported_fs generic
 _supported_os Linux
 _require_test
-_require_scratch_dax
+_require_scratch_dax_mountopt "dax"
 _require_test_program "t_mmap_write_ro"
 # running by unpriviliged user is not necessary to reproduce
 # this bug, just trying to test more.
diff --git a/tests/xfs/260 b/tests/xfs/260
index 3464ffef..fbdc4cd8 100755
--- a/tests/xfs/260
+++ b/tests/xfs/260
@@ -30,10 +30,10 @@ rm -f $seqres.full
 
 _supported_fs xfs
 _supported_os Linux
-_require_scratch_dax
+_require_scratch_dax_mountopt "dax"
 _require_test_program "feature"
 _require_test_program "t_mmap_dio"
-_require_xfs_io_command "chattr" "x"
+_require_scratch_dax_iflag
 _require_xfs_io_command "falloc"
 
 prep_files()
-- 
2.21.0


  parent reply	other threads:[~2020-06-17  9:47 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-17  9:31 [PATCH v2 0/6] Make fstests support new behavior of DAX Xiao Yang
2020-06-17  9:31 ` [PATCH v2 1/6] common/rc: Introduce new helpers for DAX mount options and FS_XFLAG_DAX Xiao Yang
2020-06-17 20:58   ` Ira Weiny
2020-06-17  9:32 ` Xiao Yang [this message]
2020-06-17 20:58   ` [PATCH v2 2/6] fstests: Use _require_scratch_dax_mountopt() and _require_scratch_dax_iflag() Ira Weiny
2020-06-17  9:32 ` [PATCH v2 3/6] common/rc: Remove unused _require_scratch_dax() Xiao Yang
2020-06-17 20:59   ` Ira Weiny
2020-06-17  9:32 ` [PATCH v2 4/6] generic/223: Don't clear all mkfs options for _scratch_mkfs_geom() roughly Xiao Yang
2020-06-17  9:32 ` [PATCH v2 5/6] generic/413, xfs/260: Improve format operation for PMD fault testing Xiao Yang
2020-06-23  6:00   ` Xiao Yang
2020-06-23 15:28   ` Darrick J. Wong
2020-06-17  9:32 ` [PATCH v2 6/6] xfs/260: Move xfs/260 to generic Xiao Yang
2020-06-17 21:48   ` Ira Weiny
2020-06-18 15:35     ` Xiao Yang
2020-06-19 15:15       ` Ira Weiny
2020-06-23  8:51         ` Xiao Yang
2020-06-23 18:08           ` Ira Weiny
2020-06-30  7:08             ` Xiao Yang
2020-06-30 15:50               ` Ira Weiny
2020-07-01  1:07                 ` Xiao Yang
2020-06-18  0:21 ` [PATCH v2 0/6] Make fstests support new behavior of DAX Ira Weiny
2020-06-18 15:04   ` Xiao Yang

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=20200617093204.20838-3-ice_yangxiao@163.com \
    --to=ice_yangxiao@163.com \
    --cc=darrick.wong@oracle.com \
    --cc=fstests@vger.kernel.org \
    --cc=ira.weiny@intel.com \
    --cc=ross.zwisler@linux.intel.com \
    --cc=yangx.jy@cn.fujitsu.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).