ext4: add _require_ext4_mkfs_feature to check different features

1) We add _require_ext4_mkfs_feature to check the specified
   feature whether it is available in mkfs.ext4 or not.

2) We apply _require_ext4_mkfs_feature in ext4/003 and remove
   _require_mkfs_mkfs_bigalloc.

3) We add _require_ext4_mkfs_feature in ext4/306.  When 64bit
   feature is supported by mkfs.ext4, ext4/306 could skip.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Xiao Yang
2017-03-02 14:03:12 +08:00
committed by Eryu Guan
parent c024334d13
commit de86b28517
3 changed files with 17 additions and 6 deletions
+15 -5
View File
@@ -1761,12 +1761,22 @@ _require_scratch_ext4_crc()
_scratch_unmount
}
# this test requires the bigalloc feature to be available in mkfs.ext4
#
_require_ext4_mkfs_bigalloc()
# Check the specified feature whether it is available in mkfs.ext4 or not.
_require_ext4_mkfs_feature()
{
$MKFS_EXT4_PROG -F -O bigalloc -n $SCRATCH_DEV 512m >/dev/null 2>&1 \
|| _notrun "mkfs.ext4 doesn't have bigalloc feature"
local feature=$1
local testfile=/tmp/$$.ext4_mkfs
if [ -z "$feature" ]; then
echo "Usage: _require_ext4_mkfs_feature feature"
exit 1
fi
touch $testfile
local result=$($MKFS_EXT4_PROG -F -O $feature -n $testfile 512m 2>&1)
rm -f $testfile
echo $result | grep -q "Invalid filesystem option" && \
_notrun "mkfs.ext4 doesn't support $feature feature"
}
# this test requires the ext4 kernel support bigalloc feature
+1 -1
View File
@@ -38,7 +38,7 @@ _supported_fs ext4
_supported_os Linux
_require_scratch
_require_ext4_mkfs_bigalloc
_require_ext4_mkfs_feature "bigalloc"
_require_ext4_bigalloc
rm -f $seqres.full
+1
View File
@@ -44,6 +44,7 @@ _supported_fs ext4
_supported_os Linux
_require_scratch
_require_ext4_mkfs_feature "64bit"
rm -f $seqres.full