From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EFFDC4727E for ; Wed, 7 Oct 2020 18:28:25 +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 0AE4721707 for ; Wed, 7 Oct 2020 18:28:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0AE4721707 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.3721.11142 (Exim 4.92) (envelope-from ) id 1kQEAf-0004n2-Hz; Wed, 07 Oct 2020 18:28:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 3721.11142; Wed, 07 Oct 2020 18:28:13 +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" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQEAf-0004m6-5x; Wed, 07 Oct 2020 18:28:13 +0000 Received: by outflank-mailman (input) for mailman id 3721; Wed, 07 Oct 2020 18:28:12 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE5Q-00072Q-O9 for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:22:48 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 27e5ae2d-afc6-47d4-96cc-d1a866bf576b; Wed, 07 Oct 2020 18:21:10 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDk4-0007CF-PI; Wed, 07 Oct 2020 19:00:44 +0100 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kQE5Q-00072Q-O9 for xen-devel@lists.xenproject.org; Wed, 07 Oct 2020 18:22:48 +0000 X-Inumbo-ID: 27e5ae2d-afc6-47d4-96cc-d1a866bf576b Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 27e5ae2d-afc6-47d4-96cc-d1a866bf576b; Wed, 07 Oct 2020 18:21:10 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1kQDk4-0007CF-PI; Wed, 07 Oct 2020 19:00:44 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 45/82] sg-run-job: Detect improper use of @ iffail with run-ts Date: Wed, 7 Oct 2020 18:59:47 +0100 Message-Id: <20201007180024.7932-46-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201007180024.7932-1-iwj@xenproject.org> References: <20201007180024.7932-1-iwj@xenproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ian Jackson Only per-host-ts understands this. This is a bit of a bear trap, so arrange to bail rather than putting strange step status values with `@' at the front in the database... Signed-off-by: Ian Jackson --- sg-run-job | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sg-run-job b/sg-run-job index a074cd42..067b28db 100755 --- a/sg-run-job +++ b/sg-run-job @@ -317,6 +317,9 @@ proc iffail-check {iffail okexpr iffail_status_var} { if {![regsub {^!} $iffail {} iffail_status]} { if {![uplevel 1 [list expr $okexpr]]} { return 0 } } + if {[regexp {^@} $iffail]} { + error "internal error - @ only valid for iffail with per-host-ts" + } return 1 } -- 2.20.1