xfs: notrun if kernel xfs not supports ascii-ci feature
PATCH 1/1 xfs: notrun if kernel xfs not supports ascii-ci feature
As the ascii-ci feature is deprecated, if linux build without the CONFIG_XFS_SUPPORT_ASCII_CI, mount xfs with "-n version=ci" will get EINVAL. So let's notrun if it's not supported by kernel.
Signed-off-by Zorro Lang <[email protected]>
--- common/xfs | 10 ++++++++++ tests/xfs/188 | 1 + tests/xfs/597 | 1 + tests/xfs/598 | 1 + 4 files changed, 13 insertions(+)
common/xfs +10 -0
@@ -1181,6 +1181,16 @@ _require_xfs_mkfs_ciname() || _notrun "need case-insensitive naming support in mkfs.xfs" } +# this test requires the xfs kernel support ascii-ci feature +# +_require_xfs_ciname() +{ + _try_scratch_mkfs_xfs -n version=ci >/dev/null 2>&1 + _try_scratch_mount >/dev/null 2>&1 \ + || _notrun "XFS doesn't support ascii-ci feature" + _scratch_unmount +} + # this test requires mkfs.xfs have configuration file support _require_xfs_mkfs_cfgfile() {
tests/xfs/188 +1 -0
@@ -31,6 +31,7 @@ _cleanup() _require_scratch _require_xfs_mkfs_ciname +_require_xfs_ciname _scratch_mkfs -n version=ci >/dev/null 2>&1 _scratch_mount
tests/xfs/597 +1 -0
@@ -20,6 +20,7 @@ _fixed_by_kernel_commit 9dceccc5822f \ _require_scratch _require_xfs_mkfs_ciname +_require_xfs_ciname _scratch_mkfs -n version=ci > $seqres.full _scratch_mount
tests/xfs/598 +1 -0
@@ -27,6 +27,7 @@ _fixed_by_kernel_commit 9dceccc5822f \ _require_test _require_scratch _require_xfs_mkfs_ciname +_require_xfs_ciname _scratch_mkfs -n version=ci > $seqres.full _scratch_mount
Signature · 1 line
2.45.2
common/xfs _require_xfs_mkfs_ciname() · line 1190
Quoted 2 lines
common/xfs +2
-0+ _try_scratch_mount >/dev/null 2>&1 \ + || _notrun "XFS doesn't support ascii-ci feature"
I would have normally expected the || to be placed on the previous line.
Nitpicking aside:
Reviewed-by Christoph Hellwig <[email protected]>
Quoted 5 lines · Christoph Hellwig
common/xfs _require_xfs_mkfs_ciname() · line 1190
Quoted 2 lines
common/xfs +2
-0+ _try_scratch_mount >/dev/null 2>&1 \ + || _notrun "XFS doesn't support ascii-ci feature"I would have normally expected the || to be placed on the previous line.
Sure, I'll merge this patch as this:
_try_scratch_mount >/dev/null 2>&1 || \
_notrun "XFS doesn't support ascii-ci feature"
Thanks for your reviewing.
Quoted 6 lines
Nitpicking aside:
Reviewed-by Christoph Hellwig <[email protected]>