From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH OSSTEST 05/12] sg-run-job: remove save/restore dependency on local migration support Date: Mon, 9 Feb 2015 11:09:59 +0000 Message-ID: <1423480206-9729-6-git-send-email-wei.liu2@citrix.com> References: <1423480206-9729-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1423480206-9729-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: ian.jackson@eu.citrix.com, jfehlig@suse.com, Wei Liu , ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org 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 Cc: Ian Campbell Cc: Ian Jackson --- sg-run-job | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sg-run-job b/sg-run-job index b3747a7..79ddd2a 100755 --- a/sg-run-job +++ b/sg-run-job @@ -291,13 +291,21 @@ proc run-job/test-pair {} { proc test-guest-migr {g} { set to_reap [spawn-ts . = ts-migrate-support-check + host $g local] set can_migrate [reap-ts $to_reap] - if {!$can_migrate} return + set to_reap [spawn-ts . = ts-saverestore-support-check + host] + 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} { + foreach iteration {{} .2} { + run-ts . =$iteration ts-guest-saverestore + host $g + } + } + + if {$can_migrate} { + foreach iteration {{} .2} { + run-ts . =$iteration ts-guest-localmigrate + host $g + } + run-ts . = ts-guest-localmigrate x10 + host $g } - run-ts . = ts-guest-localmigrate x10 + host $g } proc test-guest {g} { -- 1.9.1