tests: Fix failure in nojournal mode

Several tests use fs shutdown. Without journalling the filesystem isn't
guaranteed to be consistent after shutdown. So for tests that don't make
sure data makes it to the disk using fsync/sync we cannot really test
much. Skip such tests without journalling.

Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/ext4/051 b/tests/ext4/051
index 728ad19bfcecfc1012dece95e10943cfd975fc2b..9fbf0404fec90edfd03a680613334b9355b51aa1 100755 (executable)
--- a/tests/ext4/051
+++ b/tests/ext4/051
@@ -16,6 +16,7 @@ _exclude_fs ext2
 _exclude_fs ext3
 _require_scratch
 _require_scratch_shutdown
+_require_metadata_journaling
 _require_command "$TUNE2FS_PROG" tune2fs
 
 echo "Silence is golden"

diff --git a/tests/generic/536 b/tests/generic/536
index 726120e67c8e2332808f4e891d6f354a358b444c..56a8ced2f8da0e3ad731b98f814b862ade9eb95e 100755 (executable)
--- a/tests/generic/536
+++ b/tests/generic/536
@@ -17,6 +17,7 @@ _begin_fstest auto quick rw shutdown
 # Modify as appropriate.
 _require_scratch
 _require_scratch_shutdown
+_require_metadata_journaling
 
 # create a small fs and initialize free blocks with a unique pattern
 _scratch_mkfs_sized $((1024 * 1024 * 100)) >> $seqres.full 2>&1

diff --git a/tests/generic/622 b/tests/generic/622
index a67931ad877fded53d1a0b75aa2237ba91c683ca..e8ead300e36234b647c1c8082494123c6014cf38 100755 (executable)
--- a/tests/generic/622
+++ b/tests/generic/622
@@ -78,6 +78,7 @@ _cleanup()
 # rather than the test filesystem.
 _require_scratch
 _require_scratch_shutdown
+_require_metadata_journaling
 _require_xfs_io_command "pwrite"
 _require_xfs_io_command "fsync"
 _require_xfs_io_command "syncfs"

diff --git a/tests/generic/635 b/tests/generic/635
index 4a811630a6217205db90c9f7e89202719c2f6ac7..018b868cb6cea6205966aad0ecd6cf5bfd481113 100755 (executable)
--- a/tests/generic/635
+++ b/tests/generic/635
@@ -26,6 +26,7 @@ _begin_fstest auto quick atime bigtime shutdown
 
 _require_scratch
 _require_scratch_shutdown
+_require_metadata_journaling
 
 _scratch_mkfs > $seqres.full
 _scratch_mount

diff --git a/tests/generic/646 b/tests/generic/646
index b3b0ab0ace56b5786c7c1ea0ccd6de47a9263447..1e3f0cd54087fb889ea40176db4676fe93708277 100755 (executable)
--- a/tests/generic/646
+++ b/tests/generic/646
@@ -19,6 +19,7 @@ _begin_fstest auto quick recoveryloop shutdown
 
 _require_scratch
 _require_scratch_shutdown
+_require_metadata_journaling
 _scratch_mkfs > $seqres.full 2>&1
 
 _scratch_mount

diff --git a/tests/generic/705 b/tests/generic/705
index 9c27fbbc389b6b91edb3d73b954c327535dfbf90..23f06d699dfa5b37303465a720774a2ba1566b20 100755 (executable)
--- a/tests/generic/705
+++ b/tests/generic/705
@@ -12,6 +12,7 @@ _begin_fstest auto shutdown
 
 _require_scratch
 _require_scratch_shutdown
+_require_metadata_journaling
 _require_command "$FILEFRAG_PROG" filefrag
 _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount

diff --git a/tests/generic/722 b/tests/generic/722
index b9c608713c370c1bfc9dbfbc9b33ddbcc63a9cd9..10869bc7aabfdbb5ecc368e8cb6b8a3f7fbcf73c 100755 (executable)
--- a/tests/generic/722
+++ b/tests/generic/722
@@ -18,6 +18,7 @@ _require_test_program "punch-alternating"
 _require_xfs_io_command exchangerange
 _require_scratch
 _require_scratch_shutdown
+_require_metadata_journaling
 
 _scratch_mkfs >> $seqres.full
 _scratch_mount

diff --git a/tests/overlay/087 b/tests/overlay/087
index 2ad069dbf78f7faf3903fb43cadb0b612c87685d..25d021095b6fdd118427d6cf635a90f9dba494ac 100755 (executable)
--- a/tests/overlay/087
+++ b/tests/overlay/087
@@ -34,6 +34,7 @@ _begin_fstest auto quick mount shutdown
 # Modify as appropriate.
 _require_scratch_nocheck
 _require_scratch_shutdown_and_syncfs
+_require_metadata_journaling
 
 [ "$OVL_BASE_FSTYP" == "xfs" ] || \
        _notrun "base fs $OVL_BASE_FSTYP has unknown behavior with syncfs after shutdown"