On Sun, 2015-07-12 at 17:20 +0100, Wei Liu wrote: > Since we've introduced different checks for save / restore and local > migration, it's possible to run save / restore tests without running > local migration tests. > > Signed-off-by: Wei Liu <wei.l...@citrix.com> > Cc: Ian Campbell <ian.campb...@citrix.com> > Cc: Ian Jackson <ian.jack...@eu.citrix.com> > --- > sg-run-job | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/sg-run-job b/sg-run-job > index 16fcfc1..172214e 100755 > --- a/sg-run-job > +++ b/sg-run-job > @@ -302,13 +302,20 @@ proc run-job/test-pair {} { > proc test-guest-migr {g} { > set to_reap [spawn-ts . = ts-migrate-support-check + host $g 1] > set can_migrate [reap-ts $to_reap] > - if {!$can_migrate} return > + set to_reap [spawn-ts . = ts-saverestore-support-check + host]
ts-migrate-support-check takes the guest name, even though it doesn't actually need it today. I think this is justifiable because the decision as to whether migration or s/r could be achieve _might_ be dependent on the guest cfg. Thus I think ts-saverrestore-support-check ought to take $g too for consistency with that and with ts-guest-migrate too. Or $g it could be removed from the migrate check, but that's not my preference. > + set can_saverestore [reap-ts $to_reap] > > foreach iteration {{} .2} { > - run-ts . =$iteration ts-guest-saverestore + host $g > - run-ts . =$iteration ts-guest-localmigrate + host $g > + if {$can_saverestore} { > + run-ts . =$iteration ts-guest-saverestore + host $g > + } > + if {$can_migrate} { > + run-ts . =$iteration ts-guest-localmigrate + host $g > + } > + } > + if {$can_migrate} { > + run-ts . = ts-guest-localmigrate x10 + host $g > } > - run-ts . = ts-guest-localmigrate x10 + host $g > } > > proc test-guest {g} { _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel