From patchwork Wed Feb 12 14:32:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 24547 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 08B22203F3 for ; Wed, 12 Feb 2014 14:34:56 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id m5sf803532qaj.1 for ; Wed, 12 Feb 2014 06:34:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=X/9xeVbolmVS1ZDHnBNQ62eJ+tnDY+vGXjSKmCe1Bf8=; b=N9nHSZAqTnTT2eNRO5clm54hb9qeVJbwiJkOLPzxx2AWuWYdatKc1RTEVpoiKPqniX IAFaaE2VkAZiUCzPRKlCsBj0BAo/sITb790KxEEHvicr6yHzlx/oN8rcVuzURGvpcXh2 EK7vLhg/E3damKD9dIxDHJQMcnr9FDsLiQ5w1Nis7Q89DMXzh6b6EwwI3lY0qlz+fCjq ZWP0EorSfjaKql1Fdf+an4hW4PrSCLYRySMpzVzgDT3J+5gdMevyAiB3onr0CLuQIwM2 8PFyrELSqlFfD4QwfPxWmmEiam52iGIcmjZDH/QydGbUAVhsgrANMlGf1nr6ZoLGIlwf ohwg== X-Gm-Message-State: ALoCoQlJxh2ugS8N2ayal/YbMW28gf3CkNUkQmJOGlcz5zbEvEyJHQ5/Ki5iC5vycllgEFyCDkes X-Received: by 10.236.180.2 with SMTP id i2mr1507337yhm.4.1392215696060; Wed, 12 Feb 2014 06:34:56 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.227 with SMTP id m90ls3133073qga.38.gmail; Wed, 12 Feb 2014 06:34:55 -0800 (PST) X-Received: by 10.221.55.199 with SMTP id vz7mr279799vcb.40.1392215695873; Wed, 12 Feb 2014 06:34:55 -0800 (PST) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by mx.google.com with ESMTPS id us10si7367600vcb.59.2014.02.12.06.34.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Feb 2014 06:34:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.46 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.46; Received: by mail-vb0-f46.google.com with SMTP id o19so7107583vbm.33 for ; Wed, 12 Feb 2014 06:34:55 -0800 (PST) X-Received: by 10.52.186.230 with SMTP id fn6mr127161vdc.14.1392215695767; Wed, 12 Feb 2014 06:34:55 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp4609vcz; Wed, 12 Feb 2014 06:34:55 -0800 (PST) X-Received: by 10.52.244.102 with SMTP id xf6mr344288vdc.42.1392215695252; Wed, 12 Feb 2014 06:34:55 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id xs6si6348870vec.40.2014.02.12.06.34.54 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 12 Feb 2014 06:34:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDas4-0001fV-Nz; Wed, 12 Feb 2014 14:33:04 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDas3-0001fK-2d for xen-devel@lists.xen.org; Wed, 12 Feb 2014 14:33:03 +0000 Received: from [85.158.143.35:11466] by server-2.bemta-4.messagelabs.com id 5A/59-10891-E168BF25; Wed, 12 Feb 2014 14:33:02 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1392215580!5146718!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31898 invoked from network); 12 Feb 2014 14:33:01 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 12 Feb 2014 14:33:01 -0000 X-IronPort-AV: E=Sophos;i="4.95,832,1384300800"; d="scan'208";a="101922183" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 12 Feb 2014 14:32:59 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Wed, 12 Feb 2014 09:32:59 -0500 Received: from spare.cam.xci-test.com ([10.80.2.80] helo=kazak.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1WDary-0007qv-TC; Wed, 12 Feb 2014 14:32:58 +0000 From: Ian Campbell To: Date: Wed, 12 Feb 2014 14:32:58 +0000 Message-ID: <1392215578-27239-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1392215257-26993-1-git-send-email-ian.campbell@citrix.com> References: <1392215257-26993-1-git-send-email-ian.campbell@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , george.dunlap@citrix.com, xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST] Do not attempt migration tests if the platform doesn't support it X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.46 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Doing so blocks the rest of the tests in the job, which may be able to indepentently complete. So arrange for a ts-migrate-support-check test to run and gate the remaining migration tests on that. This relies on the xen patch "xl: suppress suspend/resume functions on platforms which do not support it" to actually suppress migration support on arm. Signed-off-by: Ian Campbell --- This needs to go in after the Xen patch. Otherwise this new step will appear to pass and then start to fail when the Xen patch is applied. --- sg-run-job | 8 +++++++- ts-migrate-support-check | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100755 ts-migrate-support-check diff --git a/sg-run-job b/sg-run-job index db62365..d894711 100755 --- a/sg-run-job +++ b/sg-run-job @@ -281,12 +281,18 @@ proc run-job/test-pair {} { # run-ts . remus-failover ts-remus-check src_host dst_host + debian } -proc test-guest {g} { +proc test-guest-migr {g} { + if {[catch { run-ts . = ts-migrate-support-check + host $g }]} return + foreach iteration {{} .2} { run-ts . =$iteration ts-guest-saverestore + host $g run-ts . =$iteration ts-guest-localmigrate + host $g } run-ts . = ts-guest-localmigrate x10 + host $g +} + +proc test-guest {g} { + test-guest-migr $g test-guest-nomigr $g } diff --git a/ts-migrate-support-check b/ts-migrate-support-check new file mode 100755 index 0000000..ffae1b3 --- /dev/null +++ b/ts-migrate-support-check @@ -0,0 +1,35 @@ +#!/usr/bin/perl -w +# This is part of "osstest", an automated testing framework for Xen. +# Copyright (C) 2014 Citrix Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +use strict qw(vars); +use DBI; +use Osstest; +use Osstest::TestSupport; + +tsreadconfig(); + +our $ho = selecthost($ARGV[0]); + +# all xend/xm platforms support migration +exit(0) if toolstack()->{Command} eq "xm"; + +my $help = target_cmd_output_root($ho, toolstack()->{Command}." help"); + +my $rc = ($help =~ m/^\s*migrate/m) ? 0 : 1; + +logm("rc=$rc"); +exit($rc);