diff options
author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-04-11 09:08:09 -0700 |
---|---|---|
committer | Eryu Guan <guaneryu@gmail.com> | 2018-04-14 13:50:03 +0800 |
commit | fdf6d4bc862bb3269c95986fdaf1c59271762ad6 (patch) | |
tree | 3a496c3d2b9936b0f8185b82fe79e4638298d84f | |
parent | 858c39281e1e256a8ba57202a13537206f28e3a6 (diff) | |
download | xfstests-dev-fdf6d4bc862bb3269c95986fdaf1c59271762ad6.tar.gz |
xfs/187: fix ftype brokenness
This test requires XFS_SB_VERSION_MOREBITSBIT to be zero. ftype (which
is now enabled by default) causes this to be set, so detect it in mkfs
and disable it.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
-rwxr-xr-x | tests/xfs/187 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/xfs/187 b/tests/xfs/187 index 07ef3ae167..5b81daf197 100755 --- a/tests/xfs/187 +++ b/tests/xfs/187 @@ -70,8 +70,15 @@ export MOUNT_OPTIONS="" # lazysb, attr2 and other feature bits are held in features2 and will require # morebitsbit on So test with lazysb and without it to see if the morebitsbit is # okay etc. If the mkfs defaults change, these need to change as well. -export MKFS_NO_LAZY="-m crc=0 -l lazy-count=0 -i projid32bit=0" -export MKFS_LAZY="-m crc=0 -l lazy-count=1 -i projid32bit=0" +MKFS_NO_LAZY="-m crc=0 -l lazy-count=0 -i projid32bit=0" +MKFS_LAZY="-m crc=0 -l lazy-count=1 -i projid32bit=0" + +# ftype is also stored in features2, so we have to detect its presence in +# mkfs and disable it here too. +if _scratch_mkfs --help 2>&1 | grep -q "ftype="; then + MKFS_NO_LAZY="$MKFS_NO_LAZY -n ftype=0" + MKFS_LAZY="$MKFS_LAZY -n ftype=0" +fi # Make sure that when we think we are testing with morebits off # that we really are. |