On Mon, Jun 10, 2024 at 10:41:41PM -0700, Christoph Hellwig wrote:
> xfs/073 has been failing for me for a while on most of my test setups
> with:
>
> diff: memory exhausted
>
> from the recursive diff. Switching to the significantly more memory
> efficient implementation in git diff as in the patch below fixes this.
>
> Would it be ok to pull in diff (including a supported check)?
>
> diff --git a/tests/xfs/073 b/tests/xfs/073
> index c7616b9e9..85d8ae8d0 100755
> --- a/tests/xfs/073
> +++ b/tests/xfs/073
> @@ -76,7 +76,7 @@ _verify_copy()
> fi
>
> echo comparing new image files to old
> - diff -Naur $source_dir $target_dir
> + git diff --no-index $source_dir $target_dir
The "diff" is more widespread, if we can use diff, better to not bring in
a new necessary dependence. But you can make it to be optional if you
need. Likes:
_diff()
{
local cmd="git diff"
grep -wq -- "--no-index" <($cmd --help 2>/dev/null)
if [ $? -ne 0 ];then
cmd=diff
else
cmd="$cmd --no-index"
if
$cmd $*
}
But there might be some incompatible options betweeen "diff" and "git diff".
Thanks,
Zorro
>
> echo comparing new image directories to old
> find $source_dir | _filter_path $source_dir > $tmp.manifest1
>
