Re: [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly

[Dave Chinner <david@fromorbit.com>]

On Tue, Oct 14, 2014 at 10:58:08PM +1100, Dave Chinner wrote:
> On Wed, Oct 01, 2014 at 05:27:18PM +0200, Jan Kara wrote:
> > Use appropriate environment variable (XFSDUMP_PROG) instead of hardcoding
> > 'xfsdump' name. This also makes the test fail graciously when xfsdump
> > isn't installed.
> > 
> > Signed-off-by: Jan Kara <jack@suse.cz>
> > ---
> >  tests/xfs/195 |    3 ++-
> >  1 files changed, 2 insertions(+), 1 deletions(-)
> > 
> > diff --git a/tests/xfs/195 b/tests/xfs/195
> > index c7bc7b8..b86aedb 100755
> > --- a/tests/xfs/195
> > +++ b/tests/xfs/195
> > @@ -48,7 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> >  #
> >  _do_dump()
> >  {
> > -	xfsdump -l 0 -s d -F  \
> > +	$XFSDUMP_PROG -l 0 -s d -F  \
> >  		-L prova -M prova \
> >  		-f $TEST_DIR/dumpfile -e -v excluded_files=debug $TEST_DIR \
> >  		| grep "ino $inum" \
> > @@ -58,6 +58,7 @@ _do_dump()
> >  # get standard environment, filters and checks
> >  . ./common/rc
> >  . ./common/filter
> > +. ./common/dump
> 
> This causes the test to fail, because _do_dump() is defined in
> common/dump as well. I'll fix the conflict...

Actually, this has problems with duplicate _cleanup functions too,
so It' would just be better to check for xfsdump being defined
directly rather than including common/dump....

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com