Re: [PATCH OSSTEST 05/12] sg-run-job: remove save/restore dependency on local migration support

[Ian Campbell <ian.campbell@citrix.com>]

On Mon, 2015-02-09 at 11:09 +0000, 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.

I don't know if it matters or if it was deliberate, but we used to
alternate savingrestore and localmigrate. I wondered if that was to try
and catch interesting interactions.

I think you could pretty trivially retain that (for platforms which
support both) but pushing the if can_foo's into the existing foreach
loop.

I was considering adding an x10 saverestore (using repeat-ts not the
existing ad-hoc thing), but I suppose that's out of scope here ;-)

> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
>  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} {