[PATCH 1/4] xfstests: fix scratch device filtering in 139

[Darrick J. Wong]

On Thu, Jan 28, 2016 at 11:24:46AM -0800, Darrick J. Wong wrote:
> On Thu, Jan 28, 2016 at 06:13:53PM +0100, Christoph Hellwig wrote:
> > Signed-off-by: Christoph Hellwig <hch at lst.de>
> > ---
> >  tests/xfs/139     | 4 ++--
> >  tests/xfs/139.out | 4 ++--
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> >  mode change 100644 => 100755 tests/xfs/139
> > 
> > diff --git a/tests/xfs/139 b/tests/xfs/139
> > old mode 100644
> > new mode 100755
> > index 7400cf8..51c903e
> > --- a/tests/xfs/139
> > +++ b/tests/xfs/139

DOH             ^^^

/me grabs another cup of coffee, tries again.

This patch is fine, ignore my earlier statements.

Signed-off-by: Darrick J. Wong <darrick.wong at oracle.com>

--D

> > @@ -69,8 +69,8 @@ _pwrite_byte 0x62 0 $sz "$testdir/file1" >> "$seqres.full"
> >  _scratch_remount
> >  
> >  echo "Compare files"
> > -md5sum "$testdir/file1" | _filter_test_dir
> > -md5sum "$testdir/file2" | _filter_test_dir
> > +md5sum "$testdir/file1" | _filter_scratch
> > +md5sum "$testdir/file2" | _filter_scratch
> 
> This is fixed upstream.
> 
> Well, the filtering was fixed and the test now runs on the test device
> and leaves scratchdev alone. :)
> 
> --D
> 
> >  #filefrag -v "$testdir/file1" "$testdir/file2"
> >  
> >  echo "Check scratch fs"
> > diff --git a/tests/xfs/139.out b/tests/xfs/139.out
> > index 729e2d6..090e3af 100644
> > --- a/tests/xfs/139.out
> > +++ b/tests/xfs/139.out
> > @@ -3,6 +3,6 @@ Format and mount
> >  Create the original files
> >  CoW every other block
> >  Compare files
> > -673c759fb131ccf3336c4f8c549a497e  /opt/test-139/file1
> > -dc802351f6717547cbf4c951b294f952  /opt/test-139/file2
> > +673c759fb131ccf3336c4f8c549a497e  SCRATCH_MNT/test-139/file1
> > +dc802351f6717547cbf4c951b294f952  SCRATCH_MNT/test-139/file2
> >  Check scratch fs
> > -- 
> > 2.1.4
> > 
> > _______________________________________________
> > xfs mailing list
> > xfs at oss.sgi.com
> > http://oss.sgi.com/mailman/listinfo/xfs
> 
> _______________________________________________
> xfs mailing list
> xfs at oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs