Use an explicit mkfs -n version=ci test to check whether the test should run, instead of checking the xfsprogs version. Suggested-by: Eryu Guan <eguan@xxxxxxxxxx> Signed-off-by: David Disseldorp <ddiss@xxxxxxx> --- common/xfs | 7 +++++++ tests/xfs/188 | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/xfs b/common/xfs index fbd139a..767a481 100644 --- a/common/xfs +++ b/common/xfs @@ -587,3 +587,10 @@ _require_meta_uuid() || _notrun "Kernel doesn't support meta_uuid feature" _scratch_unmount } + +# this test requires mkfs.xfs have case-insensitive naming support +_require_xfs_mkfs_ciname() +{ + _scratch_mkfs_xfs_supported -n version=ci >/dev/null 2>&1 \ + || _notrun "need case-insensitive naming support in mkfs.xfs" +} diff --git a/tests/xfs/188 b/tests/xfs/188 index 6332085..8798ecf 100755 --- a/tests/xfs/188 +++ b/tests/xfs/188 @@ -52,12 +52,8 @@ _cleanup() # real QA test starts here _supported_fs xfs _supported_os IRIX Linux - -if [ $XFSPROGS_VERSION -lt 21000 ]; then - _notrun "this test requires case-insensitive support" -fi - _require_scratch +_require_xfs_mkfs_ciname rm -f $seqres.full _scratch_mkfs -n version=ci >/dev/null 2>&1 -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html