From patchwork Mon Apr 11 16:37:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 8804321 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 08EC0C0553 for ; Mon, 11 Apr 2016 16:40:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 460E2201B4 for ; Mon, 11 Apr 2016 16:40:11 +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 EBB4420270 for ; Mon, 11 Apr 2016 16:40:09 +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 1apeqn-00059k-RT; Mon, 11 Apr 2016 16:38:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1apeqn-00059b-9d for xen-devel@lists.xenproject.org; Mon, 11 Apr 2016 16:38:09 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id B2/41-30904-0F2DB075; Mon, 11 Apr 2016 16:38:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplkeJIrShJLcpLzFFi42JxWrohUvf9Je5 wg59LDC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxnU7pZC76yV3yfeJ69gfEIWxcjJ4eEgL/E lJdX2EFsNgFdiaYtf4HiHBwiAioSt/cagJjMAqESO15YglQIA5mf1x1jBbFZBFQlpr+9zwRi8 wp4SOxofcUOMVFRovvZBLDpnAKeErsnb2cGsYWAao5emsMIMlJIQE1i7vp4iFZBiZMzn7CA2M wCEhIHX7xghhjDLXH79FTmCYx8s5CUzUJStoCRaRWjenFqUVlqka65XlJRZnpGSW5iZo6uoYG pXm5qcXFiempOYlKxXnJ+7iZGYDAxAMEOxmOTnQ8xSnIwKYny7pzPHS7El5SfUpmRWJwRX1Sa k1p8iFGGg0NJgtf+IlBOsCg1PbUiLTMHGNYwaQkOHiUR3gcXgNK8xQWJucWZ6RCpU4yKUuK8w iB9AiCJjNI8uDZYLF1ilJUS5mUEOkSIpyC1KDezBFX+FaM4B6OSMK8+yBSezLwSuOmvgBYzAS 1+9o8TZHFJIkJKqoGxbknBn5sl8ceZNFa68s+I2Bp9u2BRVFr01mvHnMxu3dBQu/RaZjrvMWb 2hSXTt8z62CF6Wq1pfq6At773/uDykr/rrn2Jn/9dU9gsJmXp0jmchtN2+fA8ijjl8aJio2+J lYlc3P+ExwVTVIuqjh+0mTDXqV/TRJRn6Uk1w+VP9jbc0Sv89N9ViaU4I9FQi7moOBEAa0tUL 6ACAAA= X-Env-Sender: prvs=902b7e3ca=Ian.Jackson@citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1460392686!21890714!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.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17421 invoked from network); 11 Apr 2016 16:38:07 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-11.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 11 Apr 2016 16:38:07 -0000 X-IronPort-AV: E=Sophos;i="5.24,462,1454976000"; d="scan'208";a="346243933" From: Ian Jackson To: Date: Mon, 11 Apr 2016 17:37:21 +0100 Message-ID: <1460392641-7060-7-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1460392641-7060-1-git-send-email-ian.jackson@eu.citrix.com> References: <1460392641-7060-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 6/6] mfi-common: Do not set di_version runvar to empty string 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 Specifically, do not set all_host_di_version to the shell variable $di_version unless the latter has a nonempty value. A set but empty value for all_host_di_version does not default to the version for the specific suite. So this produces install failures. This bug seems to have been introduced fairly recently, as fallout from recent di_version handling changes. diffing standalone-generate-dump-flight-runvars shows the expected changes. Signed-off-by: Ian Jackson --- mfi-common | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mfi-common b/mfi-common index ab7c5e3..ca1e0dd 100644 --- a/mfi-common +++ b/mfi-common @@ -414,7 +414,10 @@ test_matrix_iterate () { ;; esac - hostos_runvars="all_host_suite=$suite all_host_di_version=$di_version" + hostos_runvars="all_host_suite=$suite" + case "$di_version" in + ?*) hostos_runvars+=" all_host_di_version=$di_version" + esac for kern in ''; do