mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
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 <idryomov@gmail.com> Reviewed-by: Eryu Guan <eguan@redhat.com> Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
+1
-1
@@ -53,12 +53,12 @@ _supported_os Linux
|
|||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_cloner
|
_require_cloner
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
_require_xfs_io_command "falloc"
|
_require_xfs_io_command "falloc"
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >>$seqres.full 2>&1
|
_scratch_mkfs >>$seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -49,11 +49,11 @@ _supported_os Linux
|
|||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_cloner
|
_require_cloner
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >>$seqres.full 2>&1
|
_scratch_mkfs >>$seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -49,11 +49,11 @@ _supported_fs btrfs
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >>$seqres.full 2>&1
|
_scratch_mkfs >>$seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -48,11 +48,11 @@ _supported_fs btrfs
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >>$seqres.full 2>&1
|
_scratch_mkfs >>$seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -50,7 +50,6 @@ _supported_fs btrfs
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
@@ -64,6 +63,7 @@ populate_testdir()
|
|||||||
}
|
}
|
||||||
|
|
||||||
_scratch_mkfs >>$seqres.full 2>&1
|
_scratch_mkfs >>$seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -48,11 +48,11 @@ _supported_fs ext4
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dumpe2fs
|
_require_dumpe2fs
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
# 8M in bytes
|
# 8M in bytes
|
||||||
fssize=$((8 * 1024 * 1024))
|
fssize=$((8 * 1024 * 1024))
|
||||||
_scratch_mkfs_sized $fssize >> $seqres.full 2>&1
|
_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" | \
|
blocksize=`$DUMPE2FS_PROG -h $SCRATCH_DEV 2>/dev/null | grep "Block size" | \
|
||||||
awk '{print $3}'`
|
awk '{print $3}'`
|
||||||
|
|||||||
+1
-2
@@ -52,12 +52,11 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -56,12 +56,11 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,6 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
@@ -74,6 +73,7 @@ else
|
|||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -65,7 +65,6 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
@@ -78,6 +77,7 @@ else
|
|||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -54,11 +54,11 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -54,11 +54,11 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -59,12 +59,12 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
_require_xfs_io_command "fpunch"
|
_require_xfs_io_command "fpunch"
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -55,11 +55,11 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -60,11 +60,11 @@ _supported_os Linux
|
|||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_attrs
|
_require_attrs
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -55,11 +55,11 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -53,11 +53,11 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >> $seqres.full 2>&1
|
_scratch_mkfs >> $seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -51,7 +51,6 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
# This test was motivated by an issue found in btrfs when the btrfs no-holes
|
# 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
|
# feature is enabled (introduced in kernel 3.14). So enable the feature if the
|
||||||
@@ -65,6 +64,7 @@ fi
|
|||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >>$seqres.full 2>&1
|
_scratch_mkfs >>$seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -49,11 +49,11 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >>$seqres.full 2>&1
|
_scratch_mkfs >>$seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -48,11 +48,11 @@ _supported_fs generic
|
|||||||
_supported_os Linux
|
_supported_os Linux
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_dm_target flakey
|
_require_dm_target flakey
|
||||||
_require_metadata_journaling $SCRATCH_DEV
|
|
||||||
|
|
||||||
rm -f $seqres.full
|
rm -f $seqres.full
|
||||||
|
|
||||||
_scratch_mkfs >>$seqres.full 2>&1
|
_scratch_mkfs >>$seqres.full 2>&1
|
||||||
|
_require_metadata_journaling $SCRATCH_DEV
|
||||||
_init_flakey
|
_init_flakey
|
||||||
_mount_flakey
|
_mount_flakey
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user