From patchwork Fri Oct 22 16:13:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12578135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA109C433F5 for ; Fri, 22 Oct 2021 16:14:19 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9862E61163 for ; Fri, 22 Oct 2021 16:14:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9862E61163 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.215162.374181 (Exim 4.92) (envelope-from ) id 1mdxBG-0007Pm-Sa; Fri, 22 Oct 2021 16:14:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 215162.374181; Fri, 22 Oct 2021 16:14:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBG-0007O0-Ke; Fri, 22 Oct 2021 16:14:06 +0000 Received: by outflank-mailman (input) for mailman id 215162; Fri, 22 Oct 2021 16:14:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBE-0007Ll-J7 for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBE-0008Ib-IR for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:04 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1mdxBE-0005pZ-HJ for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:04 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1mdxBB-00021I-TW; Fri, 22 Oct 2021 17:14:02 +0100 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=7IUjLruFSXIBQC2SZQbBsA+xVWNefGvveU/I4eJ4VMw=; b=n3T7JFz5UR+KrQAIkiy8yxlqdX CdoatbDWJY6mp0Fj8Bd6cLd1nWGBB0nFHWqaaqvHeXapL8e6FxotpHX+C7qAnuYdUCbpQRjkhOLb6 UtASnRkwfdhtgIkfHJJx2V4S4kMA6LLk+Pu/W+Nmur8YGZEKU2wdVz0WXfyHtbMLcuR8=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 1/5] make-flight: do_examine_one: add firmware argument Date: Fri, 22 Oct 2021 17:13:47 +0100 Message-Id: <20211022161351.23091-2-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211022161351.23091-1-iwj@xenproject.org> References: <20211022161351.23091-1-iwj@xenproject.org> MIME-Version: 1.0 Nothing sets this yet. No functional change (checked with standalone-generate-dump-flight-runvars) Signed-off-by: Ian Jackson --- make-flight | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/make-flight b/make-flight index ecbb195bc..acb19b113 100755 --- a/make-flight +++ b/make-flight @@ -687,20 +687,31 @@ do_pv_debian_tests () { } do_examine_one () { + local firmware="$1" + case "$branch" in xen-unstable) ;; # only likely to regress on -unstable osstest) ;; # very likely to regress linux-*) ;; # often seems to regress *) return ;; # stuff used for guests is irrelevant esac + + local firmware_suffix + local firmware_hostflag + if [ "$firmware" ]; then + firmware_suffix=-$firmware + firmware_hostflag=,PropEq:Firmware:bios:$firmware + fi + local freebsd_runvars # set_freebsd_runvars expects $arch to be set to the desired FreeBSD arch. local arch=$dom0arch # Pass true to not append any hostflags when creating the FreeBSD runvars. set_freebsd_runvars true - job_create_test test-$xenarch$kern-$dom0arch-examine \ + job_create_test test-$xenarch$kern-$dom0arch-examine${firmware_suffix} \ host-examine-xen xl $xenarch $dom0arch \ - all_hostflags=$most_hostflags $freebsd_runvars + all_hostflags=$most_hostflags$firmware_hostflag \ + $freebsd_runvars } test_matrix_do_one () { From patchwork Fri Oct 22 16:13:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12578133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA3A5C43219 for ; Fri, 22 Oct 2021 16:14:19 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 822C5611CB for ; Fri, 22 Oct 2021 16:14:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 822C5611CB Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.215163.374185 (Exim 4.92) (envelope-from ) id 1mdxBH-0007W4-5H; Fri, 22 Oct 2021 16:14:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 215163.374185; Fri, 22 Oct 2021 16:14:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBG-0007Tu-UH; Fri, 22 Oct 2021 16:14:06 +0000 Received: by outflank-mailman (input) for mailman id 215163; Fri, 22 Oct 2021 16:14:04 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBE-0007Lr-No for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:04 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBE-0008If-NA for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:04 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1mdxBE-0005pf-MN for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:04 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1mdxBC-00021I-8m; Fri, 22 Oct 2021 17:14:02 +0100 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=8bn2utW7cd6zKWTRhFw/fx1rt/qE6uN0b47C37/D6yQ=; b=3Gd8TmaouMRkznrHkVweNma+2v 2HzL8XIqXD6842mEIx/5LZdEnEaUB1tYm9G0NPLv9gBBg7Fp0zjQNOOonohY+wGTrfjVYFs2BZvgH 5aIRL9RzffpIveQ/k/OWduxx4tFqmD4hK26f2ZhZte0BODHDfY+VM17Z7gfenZ8v6l0w=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 2/5] ts-memdisk-try-append: Reindent (nfc) Date: Fri, 22 Oct 2021 17:13:48 +0100 Message-Id: <20211022161351.23091-3-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211022161351.23091-1-iwj@xenproject.org> References: <20211022161351.23091-1-iwj@xenproject.org> MIME-Version: 1.0 Signed-off-by: Ian Jackson --- ts-memdisk-try-append | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ts-memdisk-try-append b/ts-memdisk-try-append index 4b54eff01..a35751eb3 100755 --- a/ts-memdisk-try-append +++ b/ts-memdisk-try-append @@ -19,17 +19,17 @@ set -xe -o posix arch=`perl -I. -e ' - use Osstest; - use Osstest::TestSupport; + use Osstest; + use Osstest::TestSupport; - tsreadconfig(); + tsreadconfig(); - our $whhost = pop @ARGV; # arg parsing bodge - $whhost ||= "host"; - our $ho = selecthost($whhost); + our $whhost = pop @ARGV; # arg parsing bodge + $whhost ||= "host"; + our $ho = selecthost($whhost); - print $ho->{Arch} or die $!; - ' "$@"` + print $ho->{Arch} or die $!; + ' "$@"` case "$arch" in amd64) From patchwork Fri Oct 22 16:13:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12578125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3D0DC433FE for ; Fri, 22 Oct 2021 16:14:18 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7596E6128E for ; Fri, 22 Oct 2021 16:14:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7596E6128E Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.215164.374193 (Exim 4.92) (envelope-from ) id 1mdxBH-0007dD-Fo; Fri, 22 Oct 2021 16:14:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 215164.374193; Fri, 22 Oct 2021 16:14:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBH-0007aT-8z; Fri, 22 Oct 2021 16:14:07 +0000 Received: by outflank-mailman (input) for mailman id 215164; Fri, 22 Oct 2021 16:14:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBF-0007Ly-0q for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBF-0008Ij-06 for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:05 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1mdxBE-0005pr-VD for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:04 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1mdxBC-00021I-KX; Fri, 22 Oct 2021 17:14:02 +0100 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=DcU6WEnD3l6gqqpttV87nLBzVOkZl/0MQXT5SDAWeuY=; b=hR+hvccWoeY638dgdU+ALg7LOh eVmLuVVkS6dJxQpkXs83HkUZ9BSPnBRofchKdcDfdGavA6uTXKOM4bpD8yCrKzC/Y+LQwKR4e17tA q6xaqk8BejJ79ig5kbQNu9C2mmpX2K2Eu0AIRnUjnHk3X5NIjoYIS3sbFhRwyEgmHyfI=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 3/5] ts-memdisk-try-append: Enable perl warnings Date: Fri, 22 Oct 2021 17:13:49 +0100 Message-Id: <20211022161351.23091-4-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211022161351.23091-1-iwj@xenproject.org> References: <20211022161351.23091-1-iwj@xenproject.org> MIME-Version: 1.0 Signed-off-by: Ian Jackson --- ts-memdisk-try-append | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-memdisk-try-append b/ts-memdisk-try-append index a35751eb3..bfb36caf7 100755 --- a/ts-memdisk-try-append +++ b/ts-memdisk-try-append @@ -18,7 +18,7 @@ set -xe -o posix -arch=`perl -I. -e ' +arch=`perl -I. -we ' use Osstest; use Osstest::TestSupport; From patchwork Fri Oct 22 16:13:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12578129 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 999D7C433EF for ; Fri, 22 Oct 2021 16:14:19 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6212461183 for ; Fri, 22 Oct 2021 16:14:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6212461183 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.215165.374201 (Exim 4.92) (envelope-from ) id 1mdxBH-0007pX-Us; Fri, 22 Oct 2021 16:14:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 215165.374201; Fri, 22 Oct 2021 16:14:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBH-0007ly-M2; Fri, 22 Oct 2021 16:14:07 +0000 Received: by outflank-mailman (input) for mailman id 215165; Fri, 22 Oct 2021 16:14:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBF-0007M4-ED for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBF-0008In-DX for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:05 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1mdxBF-0005qB-CW for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:05 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1mdxBD-00021I-7G; Fri, 22 Oct 2021 17:14:03 +0100 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=evtXNMnDQkLpcWEbYHSP3jP0fEmsSHHSw3jYqtKIZKU=; b=0NiaIbvAVXrTUNno86NNLkYUOH 7FDDvu2Y7q3i2/Aiz3f81KybXT7ccHSn6A310c7rXkNoR3cITPAN5CIj8pG28y1CVhCspeICTEdlU rq5HDrEaKtbbtucSpSXcQJjKSEsKqHwiB2DjUcN2x7QH1Jcpmr0+gt85UDjOvOJFaHJ4=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 4/5] ts-memdisk-try-append: More defensive case test Date: Fri, 22 Oct 2021 17:13:50 +0100 Message-Id: <20211022161351.23091-5-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211022161351.23091-1-iwj@xenproject.org> References: <20211022161351.23091-1-iwj@xenproject.org> MIME-Version: 1.0 Signed-off-by: Ian Jackson --- ts-memdisk-try-append | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ts-memdisk-try-append b/ts-memdisk-try-append index bfb36caf7..d5c12866f 100755 --- a/ts-memdisk-try-append +++ b/ts-memdisk-try-append @@ -34,14 +34,14 @@ arch=`perl -I. -we ' case "$arch" in amd64) ;; -'') - echo >&2 'Job arch retrieval failed?' - exit 1 - ;; -*) +[a-z]*) echo "Arch $arch not supported for memdisk tests" exit 0 ;; +*) + echo >&2 'Job arch retrieval failed?' + exit 1 + ;; esac if ./ts-freebsd-host-install --test-boot --record-append $@; then From patchwork Fri Oct 22 16:13:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12578131 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFBCCC4332F for ; Fri, 22 Oct 2021 16:14:18 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8900261163 for ; Fri, 22 Oct 2021 16:14:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8900261163 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.215166.374209 (Exim 4.92) (envelope-from ) id 1mdxBI-0007vO-DI; Fri, 22 Oct 2021 16:14:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 215166.374209; Fri, 22 Oct 2021 16:14:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBI-0007tS-2Q; Fri, 22 Oct 2021 16:14:08 +0000 Received: by outflank-mailman (input) for mailman id 215166; Fri, 22 Oct 2021 16:14:05 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBF-0007MA-ND for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:05 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mdxBF-0008Ir-MW for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:05 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1mdxBF-0005qJ-Lj for xen-devel@lists.xenproject.org; Fri, 22 Oct 2021 16:14:05 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1mdxBD-00021I-Mo; Fri, 22 Oct 2021 17:14:03 +0100 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=VDS6BNOrW+LwBBI6dSIzWM00hGlwk6ensvTQtDw+lVs=; b=5cjvR1b7IbCWRUqE78BBclBFNU p5+pYBoDLvO1Biufula2Pg8G3uFfYWeOj0DpllwreJC/SnwpPm3NmTx4ZVDQahqgQq23JWH3LodDF Z1h+8hfxF6vL3/3IQuLJ48AYmUJgkLTy8WjigO8y2Q+Nl7/9wT3FU16tTHCk6sEyWBL0=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 5/5] examination: skip memdisk on non-BIOS hosts, run per-firmware on x86 Date: Fri, 22 Oct 2021 17:13:51 +0100 Message-Id: <20211022161351.23091-6-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211022161351.23091-1-iwj@xenproject.org> References: <20211022161351.23091-1-iwj@xenproject.org> MIME-Version: 1.0 This is a combination of two changes: ts-memdisk-try-append: skip memdisk test on non-BIOS hosts make-flight: examine: Insist on -bios and -uefi tests on x86 This will let us skip ts-memdisk-try-append on non-bios platforms without risking regression. It will also definitely spot regressions which will occur on any uefi host. standalone-generate-dump-flight-runvars reveals the changes are as follows: New jobs test-amd64-i386-examine-bios test-amd64-i386-examine-uefi test-amd64-amd64-examine-bios test-amd64-amd64-examine-uefi added everywhere that has the corresponding plain job, namely osstest linux-* xen-unstable These jobs are just like the plain jobs, except that one of ,PropEq:Firmware:bios:bios ,PropEq:Firmware:bios:uefi has been added to the end of all_hostflags. Signed-off-by: Ian Jackson --- make-flight | 9 +++++++++ mfi-common | 1 + ts-memdisk-try-append | 17 +++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/make-flight b/make-flight index acb19b113..d7eeb4ebb 100755 --- a/make-flight +++ b/make-flight @@ -736,6 +736,15 @@ test_matrix_do_one () { do_credit12_tests do_examine_one + case "$dom0arch" in + i386|amd64) + # Test on BIOS, which makes sure we test one where FreeBSD should + # work. See ts-memdisk-try-append, and set_freebsd_runvars in + # mfi-common. + do_examine_one bios + do_examine_one uefi + ;; + esac # No further arm tests at the moment if [ $dom0arch = armhf -o $dom0arch = arm64 ]; then diff --git a/mfi-common b/mfi-common index 771843f05..59e712f4e 100644 --- a/mfi-common +++ b/mfi-common @@ -163,6 +163,7 @@ set_freebsd_runvars () { if [ x$no_hostflags != xtrue ]; then # osstest doesn't yet know how to install FreeBSD on UEFI hosts, so # limit the usable hardware to boxes that boot from BIOS. + # See also in ts-memdisk-try-append. freebsd_runvars="all_hostflags,=PropEq:Firmware:bios:bios" fi diff --git a/ts-memdisk-try-append b/ts-memdisk-try-append index d5c12866f..8fd6540b8 100755 --- a/ts-memdisk-try-append +++ b/ts-memdisk-try-append @@ -28,6 +28,20 @@ arch=`perl -I. -we ' $whhost ||= "host"; our $ho = selecthost($whhost); + if (get_target_property($ho,"firmware") ne "bios") { + # osstest does not yet know how to install FreeBSD on UEFI hosts + # See also in set_freebsd_runvars in mfi_common + + # Skipping this test on non-BIOS does not lead to pushes + # where this test is broken, because make-flght test_matrix_do_one + # arranges to run this test on BIOS too. + + broken("skipping memdisk because firmware is not bios", + "skip"); + print "SKIP\n" or die $!; + exit 0; + } + print $ho->{Arch} or die $!; ' "$@"` @@ -37,6 +51,9 @@ amd64) [a-z]*) echo "Arch $arch not supported for memdisk tests" exit 0 +SKIP) + echo "Step skipped." + exit 0 ;; *) echo >&2 'Job arch retrieval failed?'