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 How about (cd $source_dir ; find . -type f -print0 | xargs -0 md5sum) | \ (cd $target_dir ; md5sum -c --quiet) since 073.out doesn't contain any diff output? --D > > echo comparing new image directories to old > find $source_dir | _filter_path $source_dir > $tmp.manifest1 >
