From 31da5626e9988446d1791d97a2c803d12d3c8c25 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 12 Jan 2017 18:18:47 +0100 Subject: [PATCH] xfs/188: add and use _require_xfs_mkfs_ciname 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 Signed-off-by: David Disseldorp Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/xfs | 7 +++++++ tests/xfs/188 | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/xfs b/common/xfs index fbd139aa..767a4815 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 63320856..8798ecf9 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.39.5