From 4aa167d0d4d0134caba14bd049e9d20f7db2f387 Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Tue, 21 Jun 2022 20:37:27 +0300 Subject: [PATCH] fstests: add missing _require_freeze() to tests And add a few tests that use freeze to the freeze group Signed-off-by: Amir Goldstein Reviewed-by: Zorro Lang Signed-off-by: Zorro Lang --- tests/xfs/119 | 1 + tests/xfs/318 | 3 ++- tests/xfs/325 | 3 ++- tests/xfs/422 | 3 ++- tests/xfs/438 | 2 +- tests/xfs/517 | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/xfs/119 b/tests/xfs/119 index a11803711..b6f96601d 100755 --- a/tests/xfs/119 +++ b/tests/xfs/119 @@ -20,6 +20,7 @@ _begin_fstest log v2log auto freeze _supported_fs xfs _require_scratch +_require_freeze # this may hang sync diff --git a/tests/xfs/318 b/tests/xfs/318 index 38c7aa601..be93f9abe 100755 --- a/tests/xfs/318 +++ b/tests/xfs/318 @@ -7,7 +7,7 @@ # Simulate free extent errors with a file write and a file remove. # . ./common/preamble -_begin_fstest auto quick rw +_begin_fstest auto quick rw freeze # Override the default cleanup function. _cleanup() @@ -26,6 +26,7 @@ _supported_fs xfs _require_scratch _require_error_injection _require_xfs_io_error_injection "rmap_finish_one" +_require_freeze blksz=65536 blks=64 diff --git a/tests/xfs/325 b/tests/xfs/325 index 5b26b2b37..c6861fbcf 100755 --- a/tests/xfs/325 +++ b/tests/xfs/325 @@ -8,7 +8,7 @@ # Inject an error during extent freeing to test log recovery. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone freeze # Override the default cleanup function. _cleanup() @@ -29,6 +29,7 @@ _require_cp_reflink _require_scratch_reflink _require_error_injection _require_xfs_io_error_injection "free_extent" +_require_freeze blksz=65536 blks=30 diff --git a/tests/xfs/422 b/tests/xfs/422 index 175253aa6..a83a66df8 100755 --- a/tests/xfs/422 +++ b/tests/xfs/422 @@ -9,7 +9,7 @@ # activity, so we can't have userspace wandering in and thawing it. # . ./common/preamble -_begin_fstest dangerous_scrub dangerous_online_repair +_begin_fstest dangerous_scrub dangerous_online_repair freeze _register_cleanup "_cleanup" BUS @@ -24,6 +24,7 @@ _require_xfs_scratch_rmapbt _require_xfs_io_command "scrub" _require_xfs_io_error_injection "force_repair" _require_command "$KILLALL_PROG" killall +_require_freeze echo "Format and populate" _scratch_mkfs > "$seqres.full" 2>&1 diff --git a/tests/xfs/438 b/tests/xfs/438 index c3008b1c9..cfe75bd80 100755 --- a/tests/xfs/438 +++ b/tests/xfs/438 @@ -21,7 +21,7 @@ # Fixed by upstream commit 373b058 ("xfs: Properly retry failed dquot # items in case of error during buffer writeback") . ./common/preamble -_begin_fstest auto quick quota +_begin_fstest auto quick quota freeze # Override the default cleanup function. _cleanup() diff --git a/tests/xfs/517 b/tests/xfs/517 index 88c4f43be..f7f9a8a27 100755 --- a/tests/xfs/517 +++ b/tests/xfs/517 @@ -29,6 +29,7 @@ _supported_fs xfs _require_xfs_scratch_rmapbt _require_xfs_io_command "fsmap" _require_command "$KILLALL_PROG" killall +_require_freeze echo "Format and populate" _scratch_mkfs > "$seqres.full" 2>&1 -- 2.49.0