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 <eguan@redhat.com>
Signed-off-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/common/xfs b/common/xfs
index fbd139aa43c08ff631fb8a66d659cbf51fa3e33d..767a481564b85ad8fbf38612b44add72aebe45a3 100644 (file)
--- 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 633208568accd203648e21a611e83836bf8d6b0d..8798ecf919d93c1b3ba84ea050819c227a84cae4 100755 (executable)
--- 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