[CRIU] [RFC PATCH 18/21] zdtm: use the multi-test launcher by default

[Ivan Shapovalov]

On 2016-02-25 at 13:45 -0800, Andrew Vagin wrote:
> What does this mean? All test will be executed via launcher by
> default?
> Can we wait a bit while it's stabialized? I'm going to create a new
> job
> in ci.openvz.org and when it will be stable enought, we can make it
> as a
> default one.

Yes, it means exactly that. This patch will not be present in the final
patch series, it's purely for testing. I'll soon send another patchset
which will properly hook up the launcher in zdtm.py to actually do
multi-tests using the launcher.

In fact, almost all tests can still be used as standalone ones, even
without rebuilding (see 00 message for details).

--
Ivan Shapovalov / intelfx /

> 
> On Fri, Feb 19, 2016 at 05:50:41PM +0300, Ivan Shapovalov wrote:
> > 
> > Signed-off-by: Ivan Shapovalov <intelfx at intelfx.name>
> > ---
> >  test/zdtm.py                 | 2 +-
> >  test/zdtm/live/Makefile.live | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/test/zdtm.py b/test/zdtm.py
> > index b1a58aa..3671761 100755
> > --- a/test/zdtm.py
> > +++ b/test/zdtm.py
> > @@ -347,7 +347,7 @@ class zdtm_test:
> >  		self.__pid = 0
> >  		self.__flavor = flavor
> >  		self.__freezer = freezer
> > -		self._bins = [ name ]
> > +		self._bins = [ name,
> > os.path.normpath(os.path.dirname(name) +
> > "/../../launcher/launcher") ]
> >  		self._env = {}
> >  		self._deps = desc.get('deps', [])
> >  		self.auto_reap = True
> > diff --git a/test/zdtm/live/Makefile.live
> > b/test/zdtm/live/Makefile.live
> > index 1dff0ec..29cfb78 100644
> > --- a/test/zdtm/live/Makefile.live
> > +++ b/test/zdtm/live/Makefile.live
> > @@ -39,7 +39,7 @@ $(TST_DIR_FILE:%=%.args):
> >  	@echo --dirname=$(basename $@).dir.test --
> > filename=$(basename $@).test
> >  
> >  %.pid: %
> > -	$(<D)/$(<F) $(shell $(MAKE) -s $<.args-global) $(shell
> > $(MAKE) -s $<.args)
> > +	../../launcher/launcher $(shell $(MAKE) -s $<.args-global) 
> > --lib $(<D)/$(<F) $(shell $(MAKE) -s $<.args)
> >  
> >  %.out: %.pid %
> >  	-kill -TERM `cat $<`
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openvz.org/pipermail/criu/attachments/20160226/1e88d7f8/attachment.sig>