From 172b13b8e5c1981defcbfa19775abb239aefaad6 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 30 Jun 2022 10:46:34 -0400 Subject: [PATCH] ext4/054: skip test if the dax mount option is enabled The ext4/054 test explicitly creates a file system with a 1k blocksize. This can't possibly work on if the dax mount option is enabled, so change ext4/054 to use _scratch_mkfs_blocksized, and and a check to _scratch_mkfs_blocksized to _notrun the test if the block size is less than the page size. Also remove an unnecessary _require_test declaration since this test does not use the test device. Signed-off-by: Theodore Ts'o Reviewed-by: Zorro Lang Signed-off-by: Zorro Lang --- common/rc | 3 +++ tests/ext4/054 | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/rc b/common/rc index 918026b55..d5e6764c2 100644 --- a/common/rc +++ b/common/rc @@ -1199,6 +1199,9 @@ _scratch_mkfs_blocksized() if ! [[ $blocksize =~ $re ]] ; then _notrun "error: _scratch_mkfs_sized: block size \"$blocksize\" not an integer." fi + if [ $blocksize -lt $(get_page_size) ]; then + _exclude_scratch_mount_option dax + fi case $FSTYP in btrfs) diff --git a/tests/ext4/054 b/tests/ext4/054 index 9a11719f8..e23acbb1b 100755 --- a/tests/ext4/054 +++ b/tests/ext4/054 @@ -19,7 +19,6 @@ _begin_fstest auto quick dangerous_fuzzers # real QA test starts here _supported_fs ext4 -_require_test _require_scratch_nocheck _require_xfs_io_command "falloc" _require_xfs_io_command "pwrite" @@ -28,8 +27,8 @@ _require_xfs_io_command "fpunch" _require_command "$DEBUGFS_PROG" debugfs # In order to accurately construct the damaged extent in the following -# test steps, the blocksize is set to 1024 here -_scratch_mkfs "-b 1024" > $seqres.full 2>&1 +# test steps, the block size is set to 1024 here +_scratch_mkfs_blocksized 1024 >> $seqres.full 2>&1 _scratch_mount TEST_FILE="${SCRATCH_MNT}/testfile" -- 2.50.1