From patchwork Mon Apr 11 16:37:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 8804511 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 32257C0553 for ; Mon, 11 Apr 2016 16:49:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D8C320306 for ; Mon, 11 Apr 2016 16:49:53 +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 66B6D2028D for ; Mon, 11 Apr 2016 16:49:49 +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 1apf0O-0006fY-Ej; Mon, 11 Apr 2016 16:48:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1apf0N-0006dn-Bt for xen-devel@lists.xenproject.org; Mon, 11 Apr 2016 16:48:03 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 44/10-02994-245DB075; Mon, 11 Apr 2016 16:48:02 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeJIrShJLcpLzFFi42JxWrrBXtfpKne 4wbolvBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8a/v7PYC77yVDx9c5+tgXEyVxcjJ4eEgL/E 7UuPGEFsNgFdiaYtf9m6GDk4RARUJG7vNQAxmQVCJXa8sASpEBaIkdi3dQYziM0ioCrxcdZPM JtXwEOi4/BZdoiJihLdzyawgdicAp4SbVc3MoOMEQKqOf1RD8JUk5i7Ph6iU1Di5MwnLCA2s4 CExMEXL5ghpnBL3D49lXkCI98sJGWzkJQtYGRaxahenFpUllqka6yXVJSZnlGSm5iZo2toYKy Xm1pcnJiempOYVKyXnJ+7iREYSgxAsIOx+YvTIUZJDiYlUd6d87nDhfiS8lMqMxKLM+KLSnNS iw8xynBwKEnwCp0FygkWpaanVqRl5gCDGiYtwcGjJMIbC5LmLS5IzC3OTIdInWJUlBLnDQVJC IAkMkrz4NpgkXSJUVZKmJcR6BAhnoLUotzMElT5V4ziHIxKwrx5IFN4MvNK4Ka/AlrMBLT42T 9OkMUliQgpqQbG4k7LyyZnXHOnXGSt0t76ZMX+RRwZHoYGX+SXP724ueiHxvaj7If1HEMtRPO Ycqsvr78xU+/JjidT7n68sjFO9cqFKZeubOm+mSfYtub773s77exWeu9U7G7dec9jz9P7ugd9 VZYeaPCfstTjQJCQ4bUkvnlRjhf0TL0DFfpmvJ2zdcq7HzMPuSuxFGckGmoxFxUnAgDXiZhRn wIAAA== X-Env-Sender: prvs=902b7e3ca=Ian.Jackson@citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1460393280!34212798!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27376 invoked from network); 11 Apr 2016 16:48:01 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 11 Apr 2016 16:48:01 -0000 X-IronPort-AV: E=Sophos;i="5.24,462,1454976000"; d="scan'208";a="352968216" From: Ian Jackson To: Date: Mon, 11 Apr 2016 17:37:54 +0100 Message-ID: <1460392674-7226-2-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1460392674-7226-1-git-send-email-ian.jackson@eu.citrix.com> References: <1460392674-7226-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 2/2] sg-run-job: nested: Report nested log capture failure as `fail' 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 Previously this was `broken' (ie, infrastructure failure), which is not really true - the usual reason is that the L0 has crashed, so that efforts to manipulate the L1 do not succeed. Tested using OSSTEST_SIMULATE and this: diff --git a/sg-run-job b/sg-run-job index 8b2d5e1..0f8e278 100755 --- a/sg-run-job +++ b/sg-run-job @@ -181,6 +181,11 @@ proc spawn-ts {iffail testid args} { set xprefix {} if {[var-or-default env(OSSTEST_SIMULATE) 0]} { set xprefix echo } +puts stderr ">$ts $real_args" + switch -glob "$ts $real_args" { + {ts-logs-capture *} { set xprefix "bomb $xprefix" } + } + set log [jobdb::step-log-filename $flight $jobinfo(job) $stepno $ts] set redirects {< /dev/null} if {[string length $log]} { Signed-off-by: Ian Jackson --- sg-run-job | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sg-run-job b/sg-run-job index d1bd124..8b2d5e1 100755 --- a/sg-run-job +++ b/sg-run-job @@ -33,8 +33,9 @@ proc per-host-prep {} { } proc per-host-finish {} { + if {[nested-hosts-p]} { set broken fail } { set broken broken } per-host-ts . = {ts-leak-check check} - per-host-ts !broken capture-logs/@(*) ts-logs-capture + per-host-ts !$broken capture-logs/@(*) ts-logs-capture } proc run-job {job} { @@ -259,7 +260,7 @@ proc per-host-ts {iffail ident script args} { proc nested-hosts-p {} { global nested_layers_hosts - expr {!![llength nested_layers_hosts]} + expr {!![llength $nested_layers_hosts]} } proc nested-layer-descend {nested_hosts} {