From patchwork Fri Jun 30 16:25:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9820065 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6E1BD603F2 for ; Fri, 30 Jun 2017 16:27:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F6C2286AE for ; Fri, 30 Jun 2017 16:27:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 02FF3286BD; Fri, 30 Jun 2017 16:27:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 7DDD1286AE for ; Fri, 30 Jun 2017 16:27:58 +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 1dQyjf-0005lL-LW; Fri, 30 Jun 2017 16:25:35 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQyje-0005jS-69 for xen-devel@lists.xenproject.org; Fri, 30 Jun 2017 16:25:34 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 0D/C5-03044-D7B76595; Fri, 30 Jun 2017 16:25:33 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrohUre2Oiz S4OI/TovvWyYzOTB6HP5whSWAMYo1My8pvyKBNaN5awNTwRuuilerGhkbGH9ydDFyckgI+Eu8 Wr+KGcRmE9CVaNryl62LkYNDREBF4vZeA5Aws8ACRomH30tAbGGBKIkV63ewg9gsAqoSe9c+B WvlFfCS6Lw8nxFipJzE+eM/weKcQPGH0xaB1QsJeEq8ODeBBWS8kICaxNz18RCtghInZz5hgV glIXHwxQvmCYy8s5CkZiFJLWBkWsWoUZxaVJZapGtsrJdUlJmeUZKbmJmja2hgppebWlycmJ6 ak5hUrJecn7uJERg4DECwg3Hn+sBDjJIcTEqivCuvhUYK8SXlp1RmJBZnxBeV5qQWH2KU4eBQ kuBdWRUWKSRYlJqeWpGWmQMMYZi0BAePkgivbBBQmre4IDG3ODMdInWKUZfj1YT/35iEWPLy8 1KlxHkTQGYIgBRllObBjYDF0yVGWSlhXkago4R4ClKLcjNLUOVfMYpzMCoJ8/qDTOHJzCuB2/ QK6AgmoCOEZ4SAHFGSiJCSamBcvPJ6cqHn1tuLTE326/zLixZZuyD3UVvsAc/TF8WFjt+qnhW 2T+Qzx98DW8K6+5QvfTX13aF4wv+s1X6djraSv4+t9m3sPXBe5BivV/4it10un75NT7/yO2za qYoJC0v6+ct3bltnxLojMXzK9UX9V2qTBZSmPc+aNcugfQ/D4/5388rq7J8oK7EUZyQaajEXF ScCAFv5NMiiAgAA X-Env-Sender: prvs=3471c4a24=Ian.Jackson@citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1498839926!57213481!4 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: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39499 invoked from network); 30 Jun 2017 16:25:32 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-2.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 30 Jun 2017 16:25:32 -0000 X-IronPort-AV: E=Sophos;i="5.40,287,1496102400"; d="scan'208";a="430028788" From: Ian Jackson To: Date: Fri, 30 Jun 2017 17:25:12 +0100 Message-ID: <1498839920-17025-10-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1498839920-17025-1-git-send-email-ian.jackson@eu.citrix.com> References: <1498839920-17025-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 09/17] substep logfiles: Move defaulting of $script into Executive 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-Virus-Scanned: ClamAV using ClamSMTP We are going to want to default this here in a more sophisticated way, but we can't do that if it's already been defaulted from $0 earlier. The other consumer of this default was in JobDB/Standalone, but we have just changed that to ignore it. So, no functional change. Signed-off-by: Ian Jackson --- Osstest/JobDB/Executive.pm | 4 ++++ Osstest/TestSupport.pm | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm index 0d1b3be..fbbb5ac 100644 --- a/Osstest/JobDB/Executive.pm +++ b/Osstest/JobDB/Executive.pm @@ -252,6 +252,10 @@ END INSERT INTO steps (flight,job,stepno, step,status, testid,started) VALUES (?,?,?, ?,'running', ?,?) END + if (!defined $script) { + $script = $0; + $script =~ s{^.*/}{}; + } my $stepno; db_retry($flight,[qw(running)], $dbh_tests,[qw(flights)],sub { $snq->execute($flight,$job); diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index f10d56e..5a951e5 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -248,10 +248,6 @@ sub complete_testid ($) { sub substep_start ($;$) { my ($testid,$script) = @_; complete_testid(\$testid); - if (!defined $script) { - $script = $0; - $script =~ s{^.*/}{}; - } $mjobdb->step_start($testid,$script); }