FS/XFS testing framework
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@infradead.org>
Cc: fstests@vger.kernel.org
Subject: Re: can we pull in git as a dependency for xfstests?
Date: Tue, 11 Jun 2024 07:24:05 -0700	[thread overview]
Message-ID: <20240611142405.GD52977@frogsfrogsfrogs> (raw)
In-Reply-To: <ZmfjlWGk04r_R5j6@infradead.org>

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
> 

  reply	other threads:[~2024-06-11 14:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-11  5:41 can we pull in git as a dependency for xfstests? Christoph Hellwig
2024-06-11 14:24 ` Darrick J. Wong [this message]
2024-06-11 16:25   ` Christoph Hellwig
2024-06-12  4:58 ` Zorro Lang
2024-06-12  5:10   ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240611142405.GD52977@frogsfrogsfrogs \
    --to=djwong@kernel.org \
    --cc=fstests@vger.kernel.org \
    --cc=hch@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox