From patchwork Wed Mar 30 10:46:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 8695321 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 10B24C0553 for ; Wed, 30 Mar 2016 10:49:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 240C92035E for ; Wed, 30 Mar 2016 10:49:43 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 81CF52035B for ; Wed, 30 Mar 2016 10:49:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alDeA-0007pr-OV; Wed, 30 Mar 2016 10:46:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1alDeA-0007oz-4D for xen-devel@lists.xensource.com; Wed, 30 Mar 2016 10:46:46 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id EE/21-16378-59EABF65; Wed, 30 Mar 2016 10:46:45 +0000 X-Env-Sender: prvs=8903c9fad=Ian.Jackson@citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1459334803!31796408!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14046 invoked from network); 30 Mar 2016 10:46:44 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 30 Mar 2016 10:46:44 -0000 X-IronPort-AV: E=Sophos;i="5.24,415,1454976000"; d="scan'208";a="343356967" From: Ian Jackson MIME-Version: 1.0 Message-ID: <22267.44689.425572.33174@mariner.uk.xensource.com> Date: Wed, 30 Mar 2016 11:46:41 +0100 To: In-Reply-To: References: X-Mailer: VM 8.1.0 under 23.4.1 (i486-pc-linux-gnu) X-DLP: MIA2 Cc: Andrew Cooper Subject: Re: [Xen-devel] [xen-unstable-coverity test] 87991: trouble: broken X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP osstest service owner writes ("[xen-unstable-coverity test] 87991: trouble: broken"): > flight 87991 xen-unstable-coverity real [real] > http://logs.test-lab.xenproject.org/osstest/logs/87991/ > > Failures and problems with tests :-( > > Tests which did not succeed and are blocking, > including tests which could not be run: > coverity-amd64 3 host-install(3) broken REGR. vs. 86387 This is fallout from my attempts to untangle osstest's debian-installer version handling. I have pushed the patch below to osstest pretest and we'll see if it (a) works and (b) helps. Ian. From 162b04ac0dc05e18509caa143c9cb00690193afd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 30 Mar 2016 11:33:01 +0100 Subject: [OSSTEST PATCH] TestSupport: Move cfg_tftp_di_version from Debian.pm Strictly speaking this is a Debian-specific function. But it is called by selecthost. TestSupport does not `use Osstest::Debian' right now. As a result, currently, if $suite is not set or TftpDiVersion_$suite is not set, the program will crash with Undefined subroutine &Osstest::TestSupport::cfg_tftp_di_version called at Osstest/TestSupport.pm line 865. Fix this by moving cfg_tftp_di_version to TestSupport, where it is needed. It would be possible to make the boundary between Osstest::TestSupport and Osstest::Debian firmer by having selecthost explicitly call a selecthost_do_debian_things (perhaps optionally, or as specified by the caller). But would be quite a palaver. It is much more convenient to fudge the issue. (Of course if we have similar requirements for other OS's we can put them in TestSupport too, provided they're not too big and tangly.) Signed-off-by: Ian Jackson --- Osstest/Debian.pm | 7 ------- Osstest/TestSupport.pm | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 1e4900b..5eecf92 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -46,7 +46,6 @@ BEGIN { preseed_hook_cmds di_installcmdline_core di_vg_name - cfg_tftp_di_version ); %EXPORT_TAGS = ( ); @@ -1360,12 +1359,6 @@ sub preseed_hook_cmds () { return $preseed; } -sub cfg_tftp_di_version ($) { - my ($suite) = @_; - $suite //= 'x def suite'; # will not find $c{...} - return $c{"TftpDiVersion_$suite"} // $c{TftpDiVersion}; -} - sub debian_guest_suite ($) { my ($gho) = @_; diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 572d657..9e6479a 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -84,6 +84,7 @@ BEGIN { git_massage_url sshopts authorized_keys + cfg_tftp_di_version remote_perl_script_open remote_perl_script_done host_reboot target_reboot target_reboot_hard target_choose_vg target_umount_lv target_await_down @@ -2251,6 +2252,12 @@ sub authorized_keys () { return $authkeys; } +sub cfg_tftp_di_version ($) { + my ($suite) = @_; + $suite //= 'x def suite'; # will not find $c{...} + return $c{"TftpDiVersion_$suite"} // $c{TftpDiVersion}; +} + #---------- webspace for installer ---------- sub await_webspace_fetch_byleaf ($$$$$) {