From patchwork Fri Apr 26 16:39:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10919409 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3EE23912 for ; Fri, 26 Apr 2019 16:43:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AFE528DEB for ; Fri, 26 Apr 2019 16:43:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F52328E04; Fri, 26 Apr 2019 16:43:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C53B628DEB for ; Fri, 26 Apr 2019 16:43:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uf-000848-6L; Fri, 26 Apr 2019 16:41:25 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ud-00083p-UV for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:23 +0000 X-Inumbo-ID: 200fcf27-6842-11e9-843c-bc764e045a96 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 200fcf27-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:22 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519668" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:49 +0100 Message-ID: <20190426164002.22381-3-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 02/15] TestSupport: target_var: Use host_V for host variables X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Change `target_var' to set `IDENT_V' rather than just V. For compatibility with older flights and older flight construction, look for plain V too when looking up the variable. And, we now look at all_host_V before V. This has no functional change with existing flights, because existing flights only have all_host_suite all_host_di_version all_host_os and we never set the corresponding V form of those variables. So with existing flights the only functional change is a change to synth runvars, to add HOST_ to the name. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index fcbde0a2..6ab64d56 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2465,8 +2465,7 @@ sub guest_await ($$) { sub target_var_prefix ($) { my ($ho) = @_; - if (exists $ho->{Guest}) { return $ho->{Guest}.'_'; } - return ''; + return (exists $ho->{Guest} ? $ho->{Guest} : $ho->{Ident}).'_'; } sub target_var ($$) { @@ -2477,6 +2476,7 @@ sub target_var ($$) { push @prefixes, 'all_guest_'; } else { push @prefixes, 'all_host_'; + push @prefixes, ''; } foreach my $prefix (@prefixes) { my $v = $r{ $prefix.$vn };