From patchwork Mon Dec 6 18:18:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659317 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7BEDBC433F5 for ; Mon, 6 Dec 2021 18:19:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239721.415636 (Exim 4.92) (envelope-from ) id 1muIZx-00024J-GN; Mon, 06 Dec 2021 18:19:09 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239721.415636; Mon, 06 Dec 2021 18:19:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZx-00024C-Cf; Mon, 06 Dec 2021 18:19:09 +0000 Received: by outflank-mailman (input) for mailman id 239721; Mon, 06 Dec 2021 18:19:08 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZv-00023n-V0 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:07 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZv-00041S-Tf for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:07 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIZv-0004SP-Sd for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:07 +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 1muIZa-0001ab-95; Mon, 06 Dec 2021 18:18:46 +0000 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=lEtnuJt+WSxztv0gI+YXz7Qx8X+A2HNxfMWZD6HRtIs=; b=wvUjxe2uF+XeLWkd/xfRulO+8V 8UAuscO2uAeMnsQl+7jCkp8Vocvq3vOUto4kgsCx02mkuVJPknsyGFi4OHrf2v7DGy+iqAwbb3Pf9 L9LFNeG5/VDQURq9Vx10fe2cOna0j8MtVzRfGM5Q4HS7jI4p2L5OvrQsvzDMpMUjGftk=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 01/13] make-flight: do_examine_one: add firmware argument Date: Mon, 6 Dec 2021 18:18:27 +0000 Message-Id: <20211206181839.23463-2-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-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 Release-Acked-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 Mon Dec 6 18:18:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659323 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3189EC4321E for ; Mon, 6 Dec 2021 18:19:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239728.415713 (Exim 4.92) (envelope-from ) id 1muIa6-0004BM-Gz; Mon, 06 Dec 2021 18:19:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239728.415713; Mon, 06 Dec 2021 18:19:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIa6-0004BD-BF; Mon, 06 Dec 2021 18:19:18 +0000 Received: by outflank-mailman (input) for mailman id 239728; Mon, 06 Dec 2021 18:19:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIa4-00043g-HX for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIa4-00042t-GY for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:16 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIa4-0004XO-Fq for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:16 +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 1muIZa-0001ab-IC; Mon, 06 Dec 2021 18:18:46 +0000 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=l2p5B8Z1X/IiNxWnmW87oEopqHbNh5M0axAqa8AjdDo=; b=GjVWN4nCkoIOy58NdCKqouH+Aj orPXkU72aXgMQZ1m0ULCyxIn9ULJPeYifv6E+Ilm9KiwZ+/7JT7sWj3zgsw0hNRHXtMGxgTvigHGv OkKj5HdvG49FoUWzw8AAWh4NkySkCP2DKa1LhJcFoTVKdlXCZatBhpcP4v5vESBN2TAQ=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 02/13] ts-memdisk-try-append: Reindent (nfc) Date: Mon, 6 Dec 2021 18:18:28 +0000 Message-Id: <20211206181839.23463-3-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-1-iwj@xenproject.org> MIME-Version: 1.0 Signed-off-by: Ian Jackson Release-Acked-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 Mon Dec 6 18:18:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659331 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A0D79C433F5 for ; Mon, 6 Dec 2021 18:19:27 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239729.415719 (Exim 4.92) (envelope-from ) id 1muIa7-0004GR-AQ; Mon, 06 Dec 2021 18:19:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239729.415719; Mon, 06 Dec 2021 18:19:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIa6-0004Et-Om; Mon, 06 Dec 2021 18:19:18 +0000 Received: by outflank-mailman (input) for mailman id 239729; Mon, 06 Dec 2021 18:19:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIa4-00043i-Hi for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIa4-00042s-GY for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:16 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIa4-0004XN-Fh for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:16 +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 1muIZa-0001ab-Qq; Mon, 06 Dec 2021 18:18:46 +0000 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=icR62vyDL1qMkaGEnJxyTT6ACzd2sPw3zE4q96m+q6E=; b=L0/0P/lHruNEaIO6/xmH1bcBIs 1mgMpVUBmvhz5g9fRUKuPv/Gqm6rO0uHLy+r7OnankmHDdYIytx71tjYhPBu1oG9ilyZv5OtWnwx4 wEU+jA0f+tw/ytr9fIzenvOTx8fwQYUdpxt0Z6IYNACcLhS0TQWvukv6Xx1zk9XzKiys=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 03/13] ts-memdisk-try-append: Enable perl warnings Date: Mon, 6 Dec 2021 18:18:29 +0000 Message-Id: <20211206181839.23463-4-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-1-iwj@xenproject.org> MIME-Version: 1.0 Signed-off-by: Ian Jackson Release-Acked-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 Mon Dec 6 18:18:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659319 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DE103C43217 for ; Mon, 6 Dec 2021 18:19:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239723.415646 (Exim 4.92) (envelope-from ) id 1muIZy-0002CT-5X; Mon, 06 Dec 2021 18:19:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239723.415646; Mon, 06 Dec 2021 18:19:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZx-00029y-V5; Mon, 06 Dec 2021 18:19:09 +0000 Received: by outflank-mailman (input) for mailman id 239723; Mon, 06 Dec 2021 18:19:08 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZw-00023y-Ml for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:08 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZw-00041Y-Lw for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:08 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIZw-0004Ss-L9 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:08 +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 1muIZb-0001ab-4V; Mon, 06 Dec 2021 18:18:47 +0000 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=0/OUNZQAV8JGMY/13VgnZluycff2ARMtudSMh6lwEvk=; b=JU8tqdMvdZ7iM+tnM6psy7kiEr UcdkgWLBooYlaRS1Y+1mEXoZAPfhZ20eej1Ty6Q0i+LbJDAYEUIuX0TFOeDpfrqsaM9zKtVRfOWWV EdwKFIrI8aQnaarH0Mw4Nz3sotL6G93N5yUlaxzbHAJ7/fEJ+MviiNMpOSsDtMPAeQG8=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 04/13] ts-memdisk-try-append: More defensive case test Date: Mon, 6 Dec 2021 18:18:30 +0000 Message-Id: <20211206181839.23463-5-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-1-iwj@xenproject.org> MIME-Version: 1.0 Signed-off-by: Ian Jackson Release-Acked-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 Mon Dec 6 18:18:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659327 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DE0D7C433FE for ; Mon, 6 Dec 2021 18:19:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239724.415654 (Exim 4.92) (envelope-from ) id 1muIZy-0002L5-H7; Mon, 06 Dec 2021 18:19:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239724.415654; Mon, 06 Dec 2021 18:19:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZy-0002HU-AU; Mon, 06 Dec 2021 18:19:10 +0000 Received: by outflank-mailman (input) for mailman id 239724; Mon, 06 Dec 2021 18:19:08 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZw-000245-Nj for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:08 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZw-00041b-N5 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:08 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIZw-0004Su-M9 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:08 +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 1muIZb-0001ab-Dt; Mon, 06 Dec 2021 18:18:47 +0000 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=tKYzhrg4LaQRu+bVlR1HwzJODJv++S9HM1BoZIlLRIs=; b=fIjBgc3PxOxTwqcpRFoCJd6/R9 C22jX851az0qrpi0rEja0WQGME8WN4BSFbgPtarV0bBDyUuF6vrY/4yl8sCYbMkaGAzeUKcqh/lmA Vc1tPzqvtpDcn7/R1XLE0kdtCKVw7E1LxDHU3yX5AmKIRo7dRZX2Kx/P7wbCD9hEhAiE=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 05/13] examination: skip memdisk on non-BIOS hosts, run per-firmware on x86 Date: Mon, 6 Dec 2021 18:18:31 +0000 Message-Id: <20211206181839.23463-6-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-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 Release-Acked-by: Ian Jackson --- make-flight | 9 +++++++++ mfi-common | 1 + ts-memdisk-try-append | 18 ++++++++++++++++++ 3 files changed, 28 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..18c4aaa5c 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 $!; ' "$@"` @@ -38,6 +52,10 @@ amd64) echo "Arch $arch not supported for memdisk tests" exit 0 ;; +SKIP) + echo "Step skipped." + exit 0 + ;; *) echo >&2 'Job arch retrieval failed?' exit 1 From patchwork Mon Dec 6 18:18:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659333 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 44D19C433EF for ; Mon, 6 Dec 2021 18:19:28 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239730.415724 (Exim 4.92) (envelope-from ) id 1muIa7-0004ML-Oo; Mon, 06 Dec 2021 18:19:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239730.415724; Mon, 06 Dec 2021 18:19:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIa7-0004K5-B3; Mon, 06 Dec 2021 18:19:19 +0000 Received: by outflank-mailman (input) for mailman id 239730; Mon, 06 Dec 2021 18:19:16 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIa4-00043e-Gn for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:16 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIa4-00042q-G1 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:16 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIa4-0004XL-FE for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:16 +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 1muIZb-0001ab-Lh; Mon, 06 Dec 2021 18:18:47 +0000 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=bqo9dp3bh1RBhH7U9oY8kFETe1MnW3DmvX4ubqZj5Mg=; b=N2UAcpaYQAmrzs4S0wzvHYUQ07 enpFOaOdLCYB4IUgqM35kBDh/cM/kSGVI5EDJWeJ8frpq8ywJ3EYMgwIWUjuvXQm4xamKvsxGFzzZ oFyjtexfALV932EwD/lLUQ13U3ryLf+0rk8B9o993Wd2tNcFrnyY3OGGNwbPcZARt6SI=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 06/13] starvation: Only count "pass" and "fail" as done jobs Date: Mon, 6 Dec 2021 18:18:32 +0000 Message-Id: <20211206181839.23463-7-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-1-iwj@xenproject.org> MIME-Version: 1.0 The main effect is to treat "broken" and "blocked" jobs as not part of the flight for starvation calculations. This is correct for commissioning flights and OK for other flights. Signed-off-by: Ian Jackson Release-Acked-by: Ian Jackson --- Osstest/Executive.pm | 3 ++- ts-hosts-allocate-Executive | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index d95d848dc..9d7c71369 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -1148,7 +1148,8 @@ END # to allow for slow jobs, compared to other jobs # W number of jobs waiting - strictly, jobs in states # preparing queued running -# D number of jobs done - strictly, other states +# D number of jobs done - strictly, jobs in states +# pass fail # tuning parameters: # Xt X when D=9 W=1, ie cancel one job out of ten # Xh X when D=1 W=1, ie cancel one job out of two diff --git a/ts-hosts-allocate-Executive b/ts-hosts-allocate-Executive index 4dfcd0cd1..19047d49e 100755 --- a/ts-hosts-allocate-Executive +++ b/ts-hosts-allocate-Executive @@ -846,11 +846,14 @@ sub starving ($$$) { # is indistinguishable from a flight which is at the head # of the queue for a small set of resources. return (0, "job $j status $st, don't give up just yet"); - } else { + } elsif ($st eq 'pass' || + $st eq 'fail') { $d++; return (0, "job $j status $st but no step finished time!") unless defined $fin; $maxfin = $fin if $fin > $maxfin; + } else { + # disregard - neither W or D } } # we quit if the total time from the start of the flight From patchwork Mon Dec 6 18:18:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659315 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 92360C433EF for ; Mon, 6 Dec 2021 18:19:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239725.415665 (Exim 4.92) (envelope-from ) id 1muIZz-0002cC-C5; Mon, 06 Dec 2021 18:19:11 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239725.415665; Mon, 06 Dec 2021 18:19:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZz-0002Yu-1g; Mon, 06 Dec 2021 18:19:11 +0000 Received: by outflank-mailman (input) for mailman id 239725; Mon, 06 Dec 2021 18:19:09 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZx-00025u-J9 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:09 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZx-00041l-IB for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:09 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIZx-0004Tc-H9 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:09 +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 1muIZb-0001ab-U0; Mon, 06 Dec 2021 18:18:48 +0000 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=E4sdrcKA9Vi1NCC94foXRbrUT73w1XN6CbQdZ8WGihM=; b=ckl7geURG7dCT1Vv4lpzpctz6F 9/iBtNwa3I9eeu25U4J2FI85B2jKrhMetAgC+WIYWFUnBho91H7LCu8i9mgGIbQoUbZyrTo+rKwn8 xVZVO9y9xHUmiV2h/zywlFBlyNAxkSg8THEpl0TBm3akMrvtle42XvF9+Fy5HubDt/Zk=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 07/13] sg-run-job: Do not set a step status to pass unless it's running Date: Mon, 6 Dec 2021 18:18:33 +0000 Message-Id: <20211206181839.23463-8-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-1-iwj@xenproject.org> MIME-Version: 1.0 This avoids skip etc. being treated as pass. Signed-off-by: Ian Jackson --- tcl/JobDB-Executive.tcl | 1 + 1 file changed, 1 insertion(+) diff --git a/tcl/JobDB-Executive.tcl b/tcl/JobDB-Executive.tcl index 38248823e..8e0062f59 100644 --- a/tcl/JobDB-Executive.tcl +++ b/tcl/JobDB-Executive.tcl @@ -326,6 +326,7 @@ proc step-set-status {flight job stepno st} { AND status<>'broken' AND status<>'starved' AND status<>'fail' + AND NOT ('$st' = 'pass' AND status <> 'running') " set pause 0 db-execute-array stopinfo " From patchwork Mon Dec 6 18:18:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659321 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1DEE8C4332F for ; Mon, 6 Dec 2021 18:19:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239726.415674 (Exim 4.92) (envelope-from ) id 1muIa0-0002jj-10; Mon, 06 Dec 2021 18:19:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239726.415674; Mon, 06 Dec 2021 18:19:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZz-0002hh-GU; Mon, 06 Dec 2021 18:19:11 +0000 Received: by outflank-mailman (input) for mailman id 239726; Mon, 06 Dec 2021 18:19:09 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZx-00025z-JY for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:09 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZx-00041n-Ig for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:09 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIZx-0004Th-Hs for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:09 +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 1muIZc-0001ab-Cc; Mon, 06 Dec 2021 18:18:48 +0000 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=HAxun9MazXyqzqKC8qATdNCpO7XqgWpXADfqESY/Jcw=; b=YHRjbWl/B5Gn96/S5QoB0HUGVw OeaawK0kz+G/w4LlOBEB7hrOcrYgB4xWzK2YBVxzQlIVxdnYgkiafMm89wJ8zdCyhkGTXNDZA8fGW X9zoviaRTe/S5czo3U5KY4OfPi37rgRiHv44qtK+lD0YBY5h+eOQ53/fxcIDmifyywE8=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 08/13] TestSupport: sub broken: break out "$msg" Date: Mon, 6 Dec 2021 18:18:34 +0000 Message-Id: <20211206181839.23463-9-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-1-iwj@xenproject.org> MIME-Version: 1.0 No functional change. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index a0ca69437..b17bf08a6 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -281,8 +281,10 @@ sub broken ($;$) { AND (status='queued' OR status='running' OR status='preparing') END }); - die uc($newst).": $m; ". ($affected>0 ? "marked $flight.$job $newst" - : "($flight.$job not marked $newst)"); + my $msg = uc($newst).": $m; ". + ($affected>0 ? "marked $flight.$job $newst" + : "($flight.$job not marked $newst)"); + die $msg; } sub complete_testid ($) { From patchwork Mon Dec 6 18:18:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659329 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 82E0FC4167B for ; Mon, 6 Dec 2021 18:19:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239727.415680 (Exim 4.92) (envelope-from ) id 1muIa0-0002of-AV; Mon, 06 Dec 2021 18:19:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239727.415680; Mon, 06 Dec 2021 18:19:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZz-0002lw-S2; Mon, 06 Dec 2021 18:19:11 +0000 Received: by outflank-mailman (input) for mailman id 239727; Mon, 06 Dec 2021 18:19:10 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZy-0002N6-Fz for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:10 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIZy-000421-Ew for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:10 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIZy-0004UY-EB for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:19:10 +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 1muIZc-0001ab-M2; Mon, 06 Dec 2021 18:18:48 +0000 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=gGu0w5xm335ZO+mQt5bBh31RANCZN/xrtBOK2vpeXWI=; b=fBJVNz5JogQeGjob2UH724w5gv fD+bUVRBCkw20NnLoQZrwNF+518fmozZVd3YES0WdKVA4frRZzDrDIVDPnqDP8vejfasvmRCLqyYJ IRYkyI12/trEihCrlY3S/WOKWGoiPApMLjV+ottWbJDaSuXyisvDabzjC3Fw2/lDFe4E=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 09/13] TestSupport: sub broken: Add a newline Date: Mon, 6 Dec 2021 18:18:35 +0000 Message-Id: <20211206181839.23463-10-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-1-iwj@xenproject.org> MIME-Version: 1.0 This suppresses printing of the the line number, which is not useful. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index b17bf08a6..ff890f96c 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -283,7 +283,8 @@ END }); my $msg = uc($newst).": $m; ". ($affected>0 ? "marked $flight.$job $newst" - : "($flight.$job not marked $newst)"); + : "($flight.$job not marked $newst)"). + "\n"; die $msg; } From patchwork Mon Dec 6 18:18:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659469 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2D0D1C4332F for ; Mon, 6 Dec 2021 18:38:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239778.415749 (Exim 4.92) (envelope-from ) id 1muIry-00026b-IW; Mon, 06 Dec 2021 18:37:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239778.415749; Mon, 06 Dec 2021 18:37:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIry-00026U-FS; Mon, 06 Dec 2021 18:37:46 +0000 Received: by outflank-mailman (input) for mailman id 239778; Mon, 06 Dec 2021 18:37:45 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIrx-00026O-62 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:45 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIrx-0004Ok-3X for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:45 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIrx-0005vO-2R for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:45 +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 1muIZd-0001ab-00; Mon, 06 Dec 2021 18:18:49 +0000 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=QQIjB4bvZcjYIHEme4Iso/oFJMJrpCjQ9+ROuu/dI2c=; b=Ad22Dr4CnydoGPKYUmhV4ZS1fZ DiV7+ZaDsAook6bTdt6tvqUeCjsyQPi7KUG+odqb2+oBlqCiw3KPZQV0L1j7mLa0xsZFga+Y1Qv8p pBKvX/pl3CFdnT8TUXilxfuwBUYM/I03c6WsF1KsMxSnayrjeLMJSWfMCNrhpLgOjqpY=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 10/13] TestSupport: sub broken: exit with status 0 for skip Date: Mon, 6 Dec 2021 18:18:36 +0000 Message-Id: <20211206181839.23463-11-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-1-iwj@xenproject.org> MIME-Version: 1.0 Otherwise, whatever calls us will set the step to fail (or something). Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index ff890f96c..ebe436275 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -285,7 +285,12 @@ END ($affected>0 ? "marked $flight.$job $newst" : "($flight.$job not marked $newst)"). "\n"; - die $msg; + if ($newst =~ m{^(?:skip)$}) { + print STDERR $msg; + exit 0; + } else { + die $msg; + } } sub complete_testid ($) { From patchwork Mon Dec 6 18:18:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659473 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2D0A1C433EF for ; Mon, 6 Dec 2021 18:38:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239779.415761 (Exim 4.92) (envelope-from ) id 1muIs3-0002Nh-QS; Mon, 06 Dec 2021 18:37:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239779.415761; Mon, 06 Dec 2021 18:37:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIs3-0002NZ-N2; Mon, 06 Dec 2021 18:37:51 +0000 Received: by outflank-mailman (input) for mailman id 239779; Mon, 06 Dec 2021 18:37:49 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIs1-0002Mh-Mq for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:49 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIs1-0004P0-M2 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:49 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIs1-0005wH-L1 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:49 +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 1muIZd-0001ab-GN; Mon, 06 Dec 2021 18:18:49 +0000 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=I5yXtPyPBnrZoZJSoImKqyDBmegh/vmnKZGykPQCUgw=; b=LKM4x4aOGRg1SL7JkO8jyOpTxl 4mqvOrGATgpUiY2idBUfn37XvJplz5x5aDacHFnj2gbLKI3uR3aVx59pOwFi3PdCMJyL+7/0MfCVx RysZcOYygo2daovJry2ZcX/n+FVeBDRap2//JE7vx/D8I9+coDKhBSnxWekvU6rvGqio=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 11/13] TestSupport: sub broken: document that it does not return. Date: Mon, 6 Dec 2021 18:18:37 +0000 Message-Id: <20211206181839.23463-12-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-1-iwj@xenproject.org> MIME-Version: 1.0 Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index ebe436275..8103ea1d3 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -261,6 +261,7 @@ sub fail ($) { sub broken ($;$) { my ($m, $newst) = @_; # must be run outside transaction + # dies or exits my $affected; $newst= 'broken' unless defined $newst; eval { From patchwork Mon Dec 6 18:18:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659471 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 15CA4C4332F for ; Mon, 6 Dec 2021 18:38:14 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239780.415771 (Exim 4.92) (envelope-from ) id 1muIs8-0002h4-23; Mon, 06 Dec 2021 18:37:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239780.415771; Mon, 06 Dec 2021 18:37:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIs7-0002gx-V8; Mon, 06 Dec 2021 18:37:55 +0000 Received: by outflank-mailman (input) for mailman id 239780; Mon, 06 Dec 2021 18:37:54 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIs6-0002fi-AC for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:54 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIs6-0004PC-9K for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:54 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIs6-0005xb-8K for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:54 +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 1muIZd-0001ab-Q5; Mon, 06 Dec 2021 18:18:49 +0000 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=31pX3+SfB7iKjeeoteDv87TcVHN7S3/nDg1EO4lRsig=; b=tscEimCN5t0rG7jiUuMk4DAaaL zWmvv2Cqt1680aeGETXlqFuoPXL2TUjUAB2+MxSThYPGGp9bmgksVmP+HiAyDtAz/T/9csqik4xr0 PKOUmLCHU8oyTNospg5m3OgasoTaAWhjTVViUnTPWClKHkrOhUEtJDlZdkJ1coOP8lhQ=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 12/13] ts-memdisk-try-append: Fix for fact that broken() does not return Date: Mon, 6 Dec 2021 18:18:38 +0000 Message-Id: <20211206181839.23463-13-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-1-iwj@xenproject.org> MIME-Version: 1.0 Signed-off-by: Ian Jackson --- ts-memdisk-try-append | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ts-memdisk-try-append b/ts-memdisk-try-append index 18c4aaa5c..e34415b05 100755 --- a/ts-memdisk-try-append +++ b/ts-memdisk-try-append @@ -38,8 +38,6 @@ arch=`perl -I. -we ' broken("skipping memdisk because firmware is not bios", "skip"); - print "SKIP\n" or die $!; - exit 0; } print $ho->{Arch} or die $!; @@ -52,7 +50,7 @@ amd64) echo "Arch $arch not supported for memdisk tests" exit 0 ;; -SKIP) +'') echo "Step skipped." exit 0 ;; From patchwork Mon Dec 6 18:18:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12659475 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8214DC433F5 for ; Mon, 6 Dec 2021 18:38:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.239781.415783 (Exim 4.92) (envelope-from ) id 1muIsC-00031x-C6; Mon, 06 Dec 2021 18:38:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 239781.415783; Mon, 06 Dec 2021 18:38:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIsC-00031q-7C; Mon, 06 Dec 2021 18:38:00 +0000 Received: by outflank-mailman (input) for mailman id 239781; Mon, 06 Dec 2021 18:37:58 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIsA-00030F-T2 for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:58 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1muIsA-0004PO-SK for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:58 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1muIsA-0005yn-RP for xen-devel@lists.xenproject.org; Mon, 06 Dec 2021 18:37:58 +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 1muIZe-0001ab-B9; Mon, 06 Dec 2021 18:18:50 +0000 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:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Ezi+pDANaaVnGfDPhbBun2anRmQhQjQ+Vf4Yn52Xjy8=; b=UOSYx1lw+uauCKIitsPDcgQVxF dyhTThXCyiS6fSnxuvgFdo1wpeEm6JIHm7T7c6YOjFkmx6NGnzF2dxBdd5YMkpuyflMTxcTsdYRqm 8JdGIscC4dTyLPuAI8lj7iWhxjiTBaDgYsfTwUSiYXuHMTouaKjlsu0h74BBOK/gY+p8=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Ian Jackson Subject: [OSSTEST PATCH 13/13] ts-xen-install: enable timestamp on guests logs Date: Mon, 6 Dec 2021 18:18:39 +0000 Message-Id: <20211206181839.23463-14-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211206181839.23463-1-iwj@xenproject.org> References: <20211206181839.23463-1-iwj@xenproject.org> MIME-Version: 1.0 From: Roger Pau Monne Enable the timestamp feature of xenconsoled so guests logs have a time reference. Can be helpful when debugging boot related slowness. This requires using the XENCONSOLED_ARGS option and setting both the log and the timestamp options. Note that setting XENCONSOLED_TRACE will override any options in XENCONSOLED_ARGS, so they can not be used in conjunction. Signed-off-by: Roger Pau Monné Acked-by: Ian Jackson --- ts-xen-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-xen-install b/ts-xen-install index 47865eb60..bf55d4e5c 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -140,7 +140,7 @@ sub adjustconfig () { my @commons_config = ( - "XENCONSOLED_TRACE" => "guest", + "XENCONSOLED_ARGS" => '"--log=guest --timestamp=all"', ); my $xenstored = target_var($ho, 'xenstored');