| Message ID | 20241026201234.77387-1-zlang@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | xfs: notrun if kernel xfs not supports ascii-ci feature | expand |
> + _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 <hch@lst.de>
On Mon, Oct 28, 2024 at 01:45:12AM -0700, Christoph Hellwig wrote: > > + _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. > > Nitpicking aside: > > Reviewed-by: Christoph Hellwig <hch@lst.de> > >
diff --git a/common/xfs b/common/xfs index 62e3100ee..cbcf4ee0b 100644 --- a/common/xfs +++ b/common/xfs @@ -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() { diff --git a/tests/xfs/188 b/tests/xfs/188 index a72bf15d6..98cdfd501 100755 --- a/tests/xfs/188 +++ b/tests/xfs/188 @@ -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 diff --git a/tests/xfs/597 b/tests/xfs/597 index d3bf91a99..2bf361080 100755 --- a/tests/xfs/597 +++ b/tests/xfs/597 @@ -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 diff --git a/tests/xfs/598 b/tests/xfs/598 index 54f50cd60..20a80fcb6 100755 --- a/tests/xfs/598 +++ b/tests/xfs/598 @@ -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
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 <zlang@kernel.org> --- common/xfs | 10 ++++++++++ tests/xfs/188 | 1 + tests/xfs/597 | 1 + tests/xfs/598 | 1 + 4 files changed, 13 insertions(+)