* [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly @ 2014-10-01 15:27 Jan Kara 2014-10-01 15:27 ` [PATCH] xfs/287: Make test fail graciously when xfsdump isn't installed Jan Kara 2014-10-14 11:58 ` [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly Dave Chinner 0 siblings, 2 replies; 6+ messages in thread From: Jan Kara @ 2014-10-01 15:27 UTC (permalink / raw) To: fstests; +Cc: Jan Kara 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 # real QA test starts here _supported_fs xfs -- 1.6.0.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] xfs/287: Make test fail graciously when xfsdump isn't installed 2014-10-01 15:27 [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly Jan Kara @ 2014-10-01 15:27 ` Jan Kara 2014-10-14 11:58 ` [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly Dave Chinner 1 sibling, 0 replies; 6+ messages in thread From: Jan Kara @ 2014-10-01 15:27 UTC (permalink / raw) To: fstests; +Cc: Jan Kara Include common/dump into xfs/287 so that the test fails graciously when xfsdump isn't installed. Signed-off-by: Jan Kara <jack@suse.cz> --- tests/xfs/287 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tests/xfs/287 b/tests/xfs/287 index 445610b..b9276a7 100755 --- a/tests/xfs/287 +++ b/tests/xfs/287 @@ -35,6 +35,7 @@ rm -f $seqres.full # get standard environment, filters and checks . ./common/rc . ./common/quota +. ./common/dump _cleanup() { -- 1.6.0.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly 2014-10-01 15:27 [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly Jan Kara 2014-10-01 15:27 ` [PATCH] xfs/287: Make test fail graciously when xfsdump isn't installed Jan Kara @ 2014-10-14 11:58 ` Dave Chinner 2014-10-14 12:12 ` Dave Chinner 1 sibling, 1 reply; 6+ messages in thread From: Dave Chinner @ 2014-10-14 11:58 UTC (permalink / raw) To: Jan Kara; +Cc: fstests 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... Cheers, Dave. > > # real QA test starts here > _supported_fs xfs > -- > 1.6.0.2 > > -- > To unsubscribe from this list: send the line "unsubscribe fstests" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- Dave Chinner david@fromorbit.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly 2014-10-14 11:58 ` [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly Dave Chinner @ 2014-10-14 12:12 ` Dave Chinner 2014-10-14 12:15 ` Dave Chinner 0 siblings, 1 reply; 6+ messages in thread From: Dave Chinner @ 2014-10-14 12:12 UTC (permalink / raw) To: Jan Kara; +Cc: fstests 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly 2014-10-14 12:12 ` Dave Chinner @ 2014-10-14 12:15 ` Dave Chinner 2014-10-16 10:38 ` Jan Kara 0 siblings, 1 reply; 6+ messages in thread From: Dave Chinner @ 2014-10-14 12:15 UTC (permalink / raw) To: Jan Kara; +Cc: fstests On Tue, Oct 14, 2014 at 11:12:04PM +1100, Dave Chinner wrote: > 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.... I've dropped this for now. Can you rework it, Jan? Maybe best to use _require_command or something like that as common/dump implies certain specific usage patterns and functions are used, which this test doesn't follow... Cheers, Dave. -- Dave Chinner david@fromorbit.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly 2014-10-14 12:15 ` Dave Chinner @ 2014-10-16 10:38 ` Jan Kara 0 siblings, 0 replies; 6+ messages in thread From: Jan Kara @ 2014-10-16 10:38 UTC (permalink / raw) To: Dave Chinner; +Cc: Jan Kara, fstests On Tue 14-10-14 23:15:27, Dave Chinner wrote: > On Tue, Oct 14, 2014 at 11:12:04PM +1100, Dave Chinner wrote: > > 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.... > > I've dropped this for now. Can you rework it, Jan? Maybe best to use > _require_command or something like that as common/dump implies > certain specific usage patterns and functions are used, which this > test doesn't follow... OK, I'll try to fix it differently. I just wonder why things work for me here... Honza -- Jan Kara <jack@suse.cz> SUSE Labs, CR ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-10-16 10:38 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-10-01 15:27 [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly Jan Kara 2014-10-01 15:27 ` [PATCH] xfs/287: Make test fail graciously when xfsdump isn't installed Jan Kara 2014-10-14 11:58 ` [PATCH] xfs/195: Use XFSDUMP_PROG instead of xfsdump directly Dave Chinner 2014-10-14 12:12 ` Dave Chinner 2014-10-14 12:15 ` Dave Chinner 2014-10-16 10:38 ` Jan Kara
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.