From: Zorro Lang <zlang@kernel.org>
To: fstests@vger.kernel.org
Subject: [PATCH 1/5] generic/139: require 512 bytes to be the minimum dio size
Date: Sun, 29 May 2022 18:55:01 +0800 [thread overview]
Message-ID: <20220529105505.667891-2-zlang@kernel.org> (raw)
In-Reply-To: <20220529105505.667891-1-zlang@kernel.org>
Due to generic/139 tests base on 512 bytes aligned, so skip this test
if the minimum dio write size >512. This patch also change the
common/rc::_require_dio helper, supports a minimum aligned size
argument.
Signed-off-by: Zorro Lang <zlang@kernel.org>
---
common/rc | 11 ++++++++---
tests/generic/139 | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/common/rc b/common/rc
index 2f31ca46..6f7a37fd 100644
--- a/common/rc
+++ b/common/rc
@@ -2721,7 +2721,8 @@ _require_xfs_io_command()
fi
}
-# check that kernel and filesystem support direct I/O
+# check that kernel and filesystem support direct I/O, and check if "$1" size
+# aligned (optional) is supported
_require_odirect()
{
if [ $FSTYP = "ext4" ] || [ $FSTYP = "f2fs" ] ; then
@@ -2735,9 +2736,13 @@ _require_odirect()
fi
fi
local testfile=$TEST_DIR/$$.direct
- $XFS_IO_PROG -F -f -d -c "pwrite 0 20k" $testfile > /dev/null 2>&1
+ local opt
+ if [ -n "$1" ];then
+ opt="-b $1"
+ fi
+ $XFS_IO_PROG -F -f -d -c "pwrite $opt 0 20k" $testfile > /dev/null 2>&1
if [ $? -ne 0 ]; then
- _notrun "O_DIRECT is not supported"
+ _notrun "O_DIRECT $1 is not supported"
fi
rm -f $testfile 2>&1 > /dev/null
}
diff --git a/tests/generic/139 b/tests/generic/139
index 0bbc222c..3eb1519d 100755
--- a/tests/generic/139
+++ b/tests/generic/139
@@ -26,7 +26,7 @@ _cleanup()
# real QA test starts here
_require_test_reflink
_require_cp_reflink
-_require_odirect
+_require_odirect 512
testdir=$TEST_DIR/test-$seq
rm -rf $testdir
--
2.31.1
next prev parent reply other threads:[~2022-05-29 10:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-29 10:55 [PATCH 0/5] random fixes for fstests Zorro Lang
2022-05-29 10:55 ` Zorro Lang [this message]
2022-05-30 0:11 ` [PATCH 1/5] generic/139: require 512 bytes to be the minimum dio size Dave Chinner
2022-05-29 10:55 ` [PATCH 2/5] generic/506: call _require_quota before _qmount Zorro Lang
2022-05-30 0:12 ` Dave Chinner
2022-05-29 10:55 ` [PATCH 3/5] generic/591: remove redundant output from golden image Zorro Lang
2022-05-30 0:44 ` Dave Chinner
2022-05-30 5:43 ` Zorro Lang
2022-05-29 10:55 ` [PATCH 4/5] generic/591: use proper sector size Zorro Lang
2022-05-29 23:57 ` Dave Chinner
2022-05-30 6:02 ` Zorro Lang
2022-05-29 10:55 ` [PATCH 5/5] generic/623: add overlay into the blacklist Zorro Lang
2022-05-30 5:54 ` Amir Goldstein
2022-05-30 6:22 ` Zorro Lang
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=20220529105505.667891-2-zlang@kernel.org \
--to=zlang@kernel.org \
--cc=fstests@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox