[PATCH OSSTEST] Toolstack: Do not pass -F to xm shutdown (Was: Re: [xen-4.2-testing test] 57630: regressions - FAIL)

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

On Mon, 2015-06-01 at 08:56 +0100, Jan Beulich wrote:
> >>> On 01.06.15 at 00:57, <osstest@xenbits.xen.org> wrote:
> > flight 57630 xen-4.2-testing real [real]
> > http://logs.test-lab.xenproject.org/osstest/logs/57630/ 
> > 
> > Regressions :-(
> > 
> > Tests which did not succeed and are blocking,
> > including tests which could not be run:
> >  test-amd64-i386-xend-winxpsp3 16 guest-stop               fail REGR. vs. 53018
> >  test-amd64-i386-xend-qemut-winxpsp3 16 guest-stop         fail REGR. vs. 53018
> 
> This seems to be due to osstest using an unrecognized option:
> 
> 2015-05-31 20:32:59 Z executing ssh ... root@172.16.144.32 xm shutdown -wF win.guest.osstest
> Error: option -F not recognized

I think this osstest patch ought to fix it. I've only "tested" with perl
-c though.

--------8>--------


>From aa79bd958fe42da2876fd76e61468c183a7fabdc Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 1 Jun 2015 09:32:37 +0100
Subject: [PATCH] Toolstack: Do not pass -F to xm shutdown

This is a feature of xl only.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 Osstest/Toolstack/xl.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Osstest/Toolstack/xl.pm b/Osstest/Toolstack/xl.pm
index dd12ae1..23328d3 100644
--- a/Osstest/Toolstack/xl.pm
+++ b/Osstest/Toolstack/xl.pm
@@ -56,7 +56,7 @@ sub shutdown_wait ($$$) {
     my $ho = $self->{Host};
     my $gn = $gho->{Name};
     my $acpi_fallback = guest_var($gho,'acpi_shutdown','false') eq 'true'
-	? "F" : "";
+	&& $self->{Name} eq 'xl' ? "F" : "";
     target_cmd_root($ho,"$self->{_Command} shutdown -w${acpi_fallback} $gn", $timeout);
 }
 
-- 
2.1.4