From: Ilya Dryomov Date: Thu, 24 Aug 2017 14:17:38 +0000 (+0200) Subject: fstests: don't _require_metadata_journaling before _scratch_mkfs X-Git-Tag: v2022.05.01~1910 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85c9af689b8b3d14011ceec2a44aa5d4a284ae7c;p=xfstests-dev.git fstests: don't _require_metadata_journaling before _scratch_mkfs This is obviously wrong and makes ./check -r skip over tests on ext4 with "ext4 on $DEV not configured with metadata journaling". Signed-off-by: Ilya Dryomov Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/tests/btrfs/095 b/tests/btrfs/095 index f256e889..29e828c3 100755 --- a/tests/btrfs/095 +++ b/tests/btrfs/095 @@ -53,12 +53,12 @@ _supported_os Linux _require_scratch _require_dm_target flakey _require_cloner -_require_metadata_journaling $SCRATCH_DEV _require_xfs_io_command "falloc" rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/btrfs/098 b/tests/btrfs/098 index ba95fd39..c7211a66 100755 --- a/tests/btrfs/098 +++ b/tests/btrfs/098 @@ -49,11 +49,11 @@ _supported_os Linux _require_scratch _require_dm_target flakey _require_cloner -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/btrfs/118 b/tests/btrfs/118 index 740cb92b..e66a4bdc 100755 --- a/tests/btrfs/118 +++ b/tests/btrfs/118 @@ -49,11 +49,11 @@ _supported_fs btrfs _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/btrfs/119 b/tests/btrfs/119 index cf075502..4414f02f 100755 --- a/tests/btrfs/119 +++ b/tests/btrfs/119 @@ -48,11 +48,11 @@ _supported_fs btrfs _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/btrfs/120 b/tests/btrfs/120 index 329b45c2..72108ffc 100755 --- a/tests/btrfs/120 +++ b/tests/btrfs/120 @@ -50,7 +50,6 @@ _supported_fs btrfs _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full @@ -64,6 +63,7 @@ populate_testdir() } _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/ext4/021 b/tests/ext4/021 index d5fad7ce..8a780873 100755 --- a/tests/ext4/021 +++ b/tests/ext4/021 @@ -48,11 +48,11 @@ _supported_fs ext4 _supported_os Linux _require_scratch _require_dumpe2fs -_require_metadata_journaling $SCRATCH_DEV # 8M in bytes fssize=$((8 * 1024 * 1024)) _scratch_mkfs_sized $fssize >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV blocksize=`$DUMPE2FS_PROG -h $SCRATCH_DEV 2>/dev/null | grep "Block size" | \ awk '{print $3}'` diff --git a/tests/generic/034 b/tests/generic/034 index 6727b98b..facf060c 100755 --- a/tests/generic/034 +++ b/tests/generic/034 @@ -52,12 +52,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 - +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/039 b/tests/generic/039 index 7d62393e..271798a8 100755 --- a/tests/generic/039 +++ b/tests/generic/039 @@ -56,12 +56,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 - +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/040 b/tests/generic/040 index 2aeccdd3..c47f73db 100755 --- a/tests/generic/040 +++ b/tests/generic/040 @@ -61,7 +61,6 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full @@ -74,6 +73,7 @@ else _scratch_mkfs >> $seqres.full 2>&1 fi +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/041 b/tests/generic/041 index 283c305e..def959d9 100755 --- a/tests/generic/041 +++ b/tests/generic/041 @@ -65,7 +65,6 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full @@ -78,6 +77,7 @@ else _scratch_mkfs >> $seqres.full 2>&1 fi +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/056 b/tests/generic/056 index 6ca3b1ac..71ba2ae0 100755 --- a/tests/generic/056 +++ b/tests/generic/056 @@ -54,11 +54,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/057 b/tests/generic/057 index 76f438ed..8839597b 100755 --- a/tests/generic/057 +++ b/tests/generic/057 @@ -54,11 +54,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/059 b/tests/generic/059 index c3a60448..9fc66011 100755 --- a/tests/generic/059 +++ b/tests/generic/059 @@ -59,12 +59,12 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV _require_xfs_io_command "fpunch" rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/065 b/tests/generic/065 index 935f414b..9294a068 100755 --- a/tests/generic/065 +++ b/tests/generic/065 @@ -55,11 +55,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/066 b/tests/generic/066 index c42b11bb..7dea54f9 100755 --- a/tests/generic/066 +++ b/tests/generic/066 @@ -60,11 +60,11 @@ _supported_os Linux _require_scratch _require_dm_target flakey _require_attrs -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/073 b/tests/generic/073 index 9e3794fd..5e07d542 100755 --- a/tests/generic/073 +++ b/tests/generic/073 @@ -55,11 +55,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/090 b/tests/generic/090 index eeb1831e..6b412d11 100755 --- a/tests/generic/090 +++ b/tests/generic/090 @@ -53,11 +53,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/101 b/tests/generic/101 index f4f6c362..a16c58b7 100755 --- a/tests/generic/101 +++ b/tests/generic/101 @@ -51,7 +51,6 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV # This test was motivated by an issue found in btrfs when the btrfs no-holes # feature is enabled (introduced in kernel 3.14). So enable the feature if the @@ -65,6 +64,7 @@ fi rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/104 b/tests/generic/104 index 79171994..1bb5d10c 100755 --- a/tests/generic/104 +++ b/tests/generic/104 @@ -49,11 +49,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/106 b/tests/generic/106 index efad8c83..d7f7a694 100755 --- a/tests/generic/106 +++ b/tests/generic/106 @@ -48,11 +48,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/107 b/tests/generic/107 index e0a92457..488abfb5 100755 --- a/tests/generic/107 +++ b/tests/generic/107 @@ -51,11 +51,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/177 b/tests/generic/177 index 0aeb8e4e..ec65d28b 100755 --- a/tests/generic/177 +++ b/tests/generic/177 @@ -54,11 +54,11 @@ _require_scratch _require_xfs_io_command "fpunch" _require_xfs_io_command "fiemap" _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/311 b/tests/generic/311 index d5102040..50a464ec 100755 --- a/tests/generic/311 +++ b/tests/generic/311 @@ -56,7 +56,6 @@ _supported_os Linux _require_scratch_nocheck _require_odirect _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV # xfs_io is not required for this test, but it's the best way to verify # the test system supports fallocate() for allocation @@ -97,6 +96,7 @@ _run_test() } _scratch_mkfs >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV # Create a basic flakey device that will never error out _init_flakey diff --git a/tests/generic/321 b/tests/generic/321 index 87985031..6cf80e2d 100755 --- a/tests/generic/321 +++ b/tests/generic/321 @@ -44,7 +44,6 @@ _supported_fs generic _supported_os Linux _require_scratch_nocheck _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full @@ -118,6 +117,7 @@ _replay_rename_test() } _scratch_mkfs >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV # Create a basic flakey device that will never error out _init_flakey diff --git a/tests/generic/322 b/tests/generic/322 index 475a31ce..60ae5eab 100755 --- a/tests/generic/322 +++ b/tests/generic/322 @@ -44,7 +44,6 @@ _supported_fs generic _supported_os Linux _require_scratch_nocheck _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full @@ -93,6 +92,7 @@ _write_after_fsync_rename_test() } _scratch_mkfs >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV # Create a basic flakey device that will never error out _init_flakey diff --git a/tests/generic/325 b/tests/generic/325 index a0b641a2..fc5bbedf 100755 --- a/tests/generic/325 +++ b/tests/generic/325 @@ -54,12 +54,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 - +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/335 b/tests/generic/335 index 0f79b6db..d9ca2683 100755 --- a/tests/generic/335 +++ b/tests/generic/335 @@ -49,11 +49,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/336 b/tests/generic/336 index acf9856b..82e74295 100755 --- a/tests/generic/336 +++ b/tests/generic/336 @@ -50,11 +50,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/341 b/tests/generic/341 index 1fde346a..8102a617 100755 --- a/tests/generic/341 +++ b/tests/generic/341 @@ -50,11 +50,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/342 b/tests/generic/342 index f1edc2df..ed64e059 100755 --- a/tests/generic/342 +++ b/tests/generic/342 @@ -50,11 +50,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/343 b/tests/generic/343 index bc7980cf..bbc57c41 100755 --- a/tests/generic/343 +++ b/tests/generic/343 @@ -50,11 +50,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/348 b/tests/generic/348 index a14e2e95..3cf85659 100755 --- a/tests/generic/348 +++ b/tests/generic/348 @@ -50,11 +50,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/generic/376 b/tests/generic/376 index a519203f..ad32cba1 100755 --- a/tests/generic/376 +++ b/tests/generic/376 @@ -50,11 +50,11 @@ _supported_fs generic _supported_os Linux _require_scratch _require_dm_target flakey -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >>$seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey diff --git a/tests/shared/002 b/tests/shared/002 index 88b28260..0b278396 100755 --- a/tests/shared/002 +++ b/tests/shared/002 @@ -60,11 +60,11 @@ _supported_os Linux _require_scratch _require_dm_target flakey _require_attrs -_require_metadata_journaling $SCRATCH_DEV rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 +_require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey