On Thu, May 25, 2023 at 07:03:39PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
>
> This test depends heavily on the xattr formats created for new files.
> Parent pointers break those assumptions, so force parent pointers off.
>
> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> ---
> tests/xfs/018 | 7 ++++++-
> tests/xfs/191 | 7 ++++++-
> tests/xfs/288 | 7 ++++++-
> 3 files changed, 18 insertions(+), 3 deletions(-)
>
>
> diff --git a/tests/xfs/018 b/tests/xfs/018
> index 1ef51a2e61..34b6e91579 100755
> --- a/tests/xfs/018
> +++ b/tests/xfs/018
> @@ -100,7 +100,12 @@ attr32l="X$attr32k"
> attr64k="$attr32k$attr32k"
>
> echo "*** mkfs"
> -_scratch_mkfs >/dev/null
> +
> +# Parent pointers change the xattr formats sufficiently to break this test.
> +# Disable parent pointers if mkfs supports it.
> +mkfs_args=()
> +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0)
Maybe we need a _require_no_xfs_parent() ?
Thanks,
Zorro
> +_scratch_mkfs "${mkfs_args[@]}" >/dev/null
>
> blk_sz=$(_scratch_xfs_get_sb_field blocksize)
> err_inj_attr_sz=$(( blk_sz / 3 - 50 ))
> diff --git a/tests/xfs/191 b/tests/xfs/191
> index 7a02f1be21..0a6c20dad7 100755
> --- a/tests/xfs/191
> +++ b/tests/xfs/191
> @@ -33,7 +33,12 @@ _fixed_by_kernel_commit 7be3bd8856fb "xfs: empty xattr leaf header blocks are no
> _fixed_by_kernel_commit e87021a2bc10 "xfs: use larger in-core attr firstused field and detect overflow"
> _fixed_by_git_commit xfsprogs f50d3462c654 "xfs_repair: ignore empty xattr leaf blocks"
>
> -_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs
> +# Parent pointers change the xattr formats sufficiently to break this test.
> +# Disable parent pointers if mkfs supports it.
> +mkfs_args=()
> +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0)
> +
> +_scratch_mkfs_xfs "${mkfs_args[@]}" | _filter_mkfs >$seqres.full 2>$tmp.mkfs
> cat $tmp.mkfs >> $seqres.full
> source $tmp.mkfs
> _scratch_mount
> diff --git a/tests/xfs/288 b/tests/xfs/288
> index aa664a266e..6bfc9ac0c8 100755
> --- a/tests/xfs/288
> +++ b/tests/xfs/288
> @@ -19,8 +19,13 @@ _supported_fs xfs
> _require_scratch
> _require_attrs
>
> +# Parent pointers change the xattr formats sufficiently to break this test.
> +# Disable parent pointers if mkfs supports it.
> +mkfs_args=()
> +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0)
> +
> # get block size ($dbsize) from the mkfs output
> -_scratch_mkfs_xfs 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null
> +_scratch_mkfs_xfs "${mkfs_args[@]}" 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null
> . $tmp.mkfs
>
> _scratch_mount
>
