From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: fstests@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net,
Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [PATCH 4/8 v4] tests/xfs: convert 10 xfs's tests to be generic ones
Date: Tue, 3 Feb 2015 15:07:16 -0800 [thread overview]
Message-ID: <1423004840-45315-5-git-send-email-jaegeuk@kernel.org> (raw)
In-Reply-To: <1423004840-45315-1-git-send-email-jaegeuk@kernel.org>
This patch changes ten xfs's testcases to be generic ones, pointed out by Dave.
xfs/053 (data exposure)
xfs/137 (data vs filesize)
xfs/138 (data vs filesize vs truncate)
xfs/139 (data vs filesize vs partial truncate)
xfs/140 (data vs filesize vs extending truncate)
xfs/179 (data vs filesize w/ fsync)
xfs/180 (data vs filesize w/ sync)
xfs/182 (data vs filesize w/ recovery)
xfs/200 (recovery vs ro-block device)
xfs/306 (fsstress vs recovery)
All these tests need _require_scratch_shutdown, and some of them need
_require_bmap utils.
Suggested-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
tests/xfs/053 | 3 ++-
tests/xfs/137 | 10 ++++++----
tests/xfs/138 | 10 ++++++----
tests/xfs/139 | 10 ++++++----
tests/xfs/140 | 8 +++++---
tests/xfs/179 | 8 +++++---
tests/xfs/180 | 8 +++++---
tests/xfs/182 | 8 +++++---
tests/xfs/200 | 6 ++++--
tests/xfs/306 | 3 ++-
10 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/tests/xfs/053 b/tests/xfs/053
index 9749345..a3ebc62 100755
--- a/tests/xfs/053
+++ b/tests/xfs/053
@@ -83,9 +83,10 @@ _crashtest()
}
# Modify as appropriate.
-_supported_fs xfs
+_supported_fs generic
_supported_os Linux
_require_scratch
+_require_scratch_shutdown
_require_xfs_io_command "falloc"
_require_xfs_io_command "fpunch"
_require_xfs_io_command "fzero"
diff --git a/tests/xfs/137 b/tests/xfs/137
index 79b3b89..6ec1bcb 100755
--- a/tests/xfs/137
+++ b/tests/xfs/137
@@ -36,11 +36,13 @@ trap "exit \$status" 0 1 2 3 15
. ./common/filter
# real QA test starts here
-_supported_fs xfs
+_supported_fs generic
_supported_os Linux IRIX
_require_scratch
-_scratch_mkfs_xfs >/dev/null 2>&1
+_require_scratch_shutdown
+_require_bmap
+_scratch_mkfs >/dev/null 2>&1
_scratch_mount
# create files
@@ -84,10 +86,10 @@ do
if [ -s $file ]
then
# if file has non-zero size but no extents then it's contents will be NULLs, bad.
- if xfs_bmap $file | grep 'no extents' > /dev/null
+ if $BMAP_PROG $file | grep 'no extents' > /dev/null
then
echo corrupt file $file - non-zero size but no extents
- elif xfs_bmap $file | grep 'hole' > /dev/null
+ elif $BMAP_PROG $file | grep 'hole' > /dev/null
then
echo corrupt file $file - contains holes
else
diff --git a/tests/xfs/138 b/tests/xfs/138
index 1b11cf6..9f12639 100755
--- a/tests/xfs/138
+++ b/tests/xfs/138
@@ -36,11 +36,13 @@ trap "exit \$status" 0 1 2 3 15
. ./common/filter
# real QA test starts here
-_supported_fs xfs
+_supported_fs generic
_supported_os Linux IRIX
_require_scratch
-_scratch_mkfs_xfs >/dev/null 2>&1
+_require_scratch_shutdown
+_require_bmap
+_scratch_mkfs >/dev/null 2>&1
_scratch_mount
# create files
@@ -90,10 +92,10 @@ do
if [ -s $file ]
then
# if file has non-zero size but no extents then it's contents will be NULLs, bad.
- if xfs_bmap $file | grep 'no extents' > /dev/null
+ if $BMAP_PROG $file | grep 'no extents' > /dev/null
then
echo corrupt file $file - non-zero size but no extents
- elif xfs_bmap $file | grep 'hole' > /dev/null
+ elif $BMAP_PROG $file | grep 'hole' > /dev/null
then
echo corrupt file $file - contains holes
else
diff --git a/tests/xfs/139 b/tests/xfs/139
index e5296f7..4baa1bc 100755
--- a/tests/xfs/139
+++ b/tests/xfs/139
@@ -36,11 +36,13 @@ trap "exit \$status" 0 1 2 3 15
. ./common/filter
# real QA test starts here
-_supported_fs xfs
+_supported_fs generic
_supported_os Linux IRIX
_require_scratch
-_scratch_mkfs_xfs >/dev/null 2>&1
+_require_scratch_shutdown
+_require_bmap
+_scratch_mkfs >/dev/null 2>&1
_scratch_mount
# create files
@@ -90,10 +92,10 @@ do
if [ -s $file ]
then
# if file has non-zero size but no extents then it's contents will be NULLs, bad.
- if xfs_bmap $file | grep 'no extents' > /dev/null
+ if $BMAP_PROG $file | grep 'no extents' > /dev/null
then
echo corrupt file $file - non-zero size but no extents
- elif xfs_bmap $file | grep 'hole' > /dev/null
+ elif $BMAP_PROG $file | grep 'hole' > /dev/null
then
echo corrupt file $file - contains holes
else
diff --git a/tests/xfs/140 b/tests/xfs/140
index cccf262..aff835a 100755
--- a/tests/xfs/140
+++ b/tests/xfs/140
@@ -36,11 +36,13 @@ trap "exit \$status" 0 1 2 3 15
. ./common/filter
# real QA test starts here
-_supported_fs xfs
+_supported_fs generic
_supported_os Linux IRIX
_require_scratch
-_scratch_mkfs_xfs >/dev/null 2>&1
+_require_scratch_shutdown
+_require_bmap
+_scratch_mkfs >/dev/null 2>&1
_scratch_mount
# create files
@@ -90,7 +92,7 @@ do
if [ -s $file ]
then
# if file has non-zero size but no extents then it's contents will be NULLs, bad.
- if xfs_bmap $file | grep 'no extents' > /dev/null
+ if $BMAP_PROG $file | grep 'no extents' > /dev/null
then
echo corrupt file $file - non-zero size but no extents
else
diff --git a/tests/xfs/179 b/tests/xfs/179
index ce50d99..e71afae 100755
--- a/tests/xfs/179
+++ b/tests/xfs/179
@@ -37,11 +37,13 @@ trap "exit \$status" 0 1 2 3 15
. ./common/filter
# real QA test starts here
-_supported_fs xfs
+_supported_fs generic
_supported_os Linux IRIX
_require_scratch
-_scratch_mkfs_xfs >/dev/null 2>&1
+_require_scratch_shutdown
+_require_bmap
+_scratch_mkfs >/dev/null 2>&1
_scratch_mount
_check_files()
@@ -58,7 +60,7 @@ _check_files()
if [ `ls -l $file | tr -s ' ' | cut -d ' ' -f 5` -eq 32768 ]
then
# if file has non-zero size but no extents then it's contents will be NULLs, bad.
- if xfs_bmap $file | grep 'no extents' > /dev/null
+ if $BMAP_PROG $file | grep 'no extents' > /dev/null
then
echo corrupt file $file - non-zero size but no extents
else
diff --git a/tests/xfs/180 b/tests/xfs/180
index a0fb69a..9e9bf8d 100755
--- a/tests/xfs/180
+++ b/tests/xfs/180
@@ -37,11 +37,13 @@ trap "exit \$status" 0 1 2 3 15
. ./common/filter
# real QA test starts here
-_supported_fs xfs
+_supported_fs generic
_supported_os Linux IRIX
_require_scratch
-_scratch_mkfs_xfs >/dev/null 2>&1
+_require_scratch_shutdown
+_require_bmap
+_scratch_mkfs >/dev/null 2>&1
_scratch_mount
# Do we have enough space on disk? 10G
@@ -61,7 +63,7 @@ _check_files()
if [ `ls -l $file | tr -s ' ' | cut -d ' ' -f 5` -eq 10485760 ]
then
# if file has non-zero size but no extents then it's contents will be NULLs, bad.
- if xfs_bmap $file | grep 'no extents' > /dev/null
+ if $BMAP_PROG $file | grep 'no extents' > /dev/null
then
echo corrupt file $file - non-zero size but no extents
else
diff --git a/tests/xfs/182 b/tests/xfs/182
index b75e4fc..68d872c 100755
--- a/tests/xfs/182
+++ b/tests/xfs/182
@@ -37,11 +37,13 @@ trap "exit \$status" 0 1 2 3 15
. ./common/filter
# real QA test starts here
-_supported_fs xfs
+_supported_fs generic
_supported_os Linux IRIX
_require_scratch
-_scratch_mkfs_xfs >/dev/null 2>&1
+_require_scratch_shutdown
+_require_bmap
+_scratch_mkfs >/dev/null 2>&1
_scratch_mount
_check_files()
@@ -58,7 +60,7 @@ _check_files()
if [ `ls -l $file | tr -s ' ' | cut -d ' ' -f 5` -eq 32768 ]
then
# if file has non-zero size but no extents then it's contents will be NULLs, bad.
- if xfs_bmap $file | grep 'no extents' > /dev/null
+ if $BMAP_PROG $file | grep 'no extents' > /dev/null
then
echo corrupt file $file - non-zero size but no extents
else
diff --git a/tests/xfs/200 b/tests/xfs/200
index f0c4337..f29feb9 100755
--- a/tests/xfs/200
+++ b/tests/xfs/200
@@ -41,12 +41,14 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common/filter
# real QA test starts here
-_supported_fs xfs
+_supported_fs generic
_supported_os Linux
_require_scratch_nocheck
+_require_scratch_shutdown
+_require_norecovery
-_scratch_mkfs_xfs >/dev/null 2>&1
+_scratch_mkfs >/dev/null 2>&1
#
# Mark the device read-only
diff --git a/tests/xfs/306 b/tests/xfs/306
index 3053fd9..71f352e 100755
--- a/tests/xfs/306
+++ b/tests/xfs/306
@@ -45,10 +45,11 @@ _cleanup()
trap "_cleanup; exit \$status" 0 1 2 3 15
# real QA test starts here
-_supported_fs xfs
+_supported_fs generic
_supported_os Linux
_require_scratch
+_require_scratch_shutdown
rm -f $seqres.full
--
2.1.1
next prev parent reply other threads:[~2015-02-03 23:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-03 23:07 [PATCH 0/8 v4] make xfs/tests generic by introducing shutdown for filesystems Jaegeuk Kim
2015-02-03 23:07 ` [PATCH 1/8 v4] common/rc: add _require_scratch_shtudown Jaegeuk Kim
2015-02-05 2:01 ` Dave Chinner
2015-02-03 23:07 ` [PATCH 2/8 v4] common/rc: add _require_bmap Jaegeuk Kim
2015-02-05 2:05 ` Dave Chinner
2015-02-03 23:07 ` [PATCH 3/8 v4] common/rc: add _require_norecovery Jaegeuk Kim
2015-02-05 2:08 ` Dave Chinner
2015-02-03 23:07 ` Jaegeuk Kim [this message]
2015-02-05 2:11 ` [PATCH 4/8 v4] tests/xfs: convert 10 xfs's tests to be generic ones Dave Chinner
2015-02-03 23:07 ` [PATCH 5/8 v4] tests/generic: relocate xfs's tests into tests/generic/ Jaegeuk Kim
2015-02-05 2:19 ` Dave Chinner
2015-02-03 23:07 ` [PATCH 6/8 v4] common/rc: define dump.f2fs and logstate for f2fs Jaegeuk Kim
2015-02-05 2:48 ` Dave Chinner
2015-02-03 23:07 ` [PATCH 7/8 v4] tests/xfs: add f2fs testcase and convert them being generic Jaegeuk Kim
2015-02-05 3:12 ` Dave Chinner
2015-02-03 23:07 ` [PATCH 8/8 v4] tests/generic: relocate four xfs's tests into tests/generic/ Jaegeuk Kim
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=1423004840-45315-5-git-send-email-jaegeuk@kernel.org \
--to=jaegeuk@kernel.org \
--cc=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
/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.