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=-9.7 required=3.0 tests=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 23D10C43331 for ; Fri, 27 Mar 2020 18:16:20 +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 EB9992083E for ; Fri, 27 Mar 2020 18:16:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB9992083E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHtWH-0004DV-7K; Fri, 27 Mar 2020 18:15:49 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHtWG-0004DG-Fg for xen-devel@lists.xenproject.org; Fri, 27 Mar 2020 18:15:48 +0000 X-Inumbo-ID: f324e04a-7056-11ea-b34e-bc764e2007e4 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f324e04a-7056-11ea-b34e-bc764e2007e4; Fri, 27 Mar 2020 18:15:34 +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 1jHtW1-0004UK-8g; Fri, 27 Mar 2020 18:15:33 +0000 From: Ian Jackson To: xen-devel@lists.xenproject.org Date: Fri, 27 Mar 2020 18:15:25 +0000 Message-Id: <20200327181526.19412-5-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200327181526.19412-1-ian.jackson@eu.citrix.com> References: <20200327181526.19412-1-ian.jackson@eu.citrix.com> Subject: [Xen-devel] [OSSTEST PATCH 5/6] ts-logs-capture: try_fetch_logs: Honour $fs_ and $out_prefix X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This allows us to add some stuff to add to each pattern, and each filename. This will be useful in a moment. None of the call sites pass this yet. Signed-off-by: Ian Jackson --- ts-logs-capture | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ts-logs-capture b/ts-logs-capture index 418155ce..6be77676 100755 --- a/ts-logs-capture +++ b/ts-logs-capture @@ -68,11 +68,13 @@ END @guests = grep { defined $_->{Domid} } @allguests; } -sub try_fetch_logs ($$) { - my ($lho, $logfilepats) = @_; +sub try_fetch_logs ($$;$$) { + my ($lho, $logfilepats, $fs_prefix,$out_prefix) = @_; + $fs_prefix //= ''; + $out_prefix //= ''; my $ok= 0; foreach my $logfilepat (@$logfilepats) { - my $logfileslist= $logfilepat; + my $logfileslist= $fs_prefix.$logfilepat; if ($logfileslist =~ m/[*?]/) { if (!eval { $logfileslist= @@ -91,8 +93,9 @@ END } foreach my $logfile (split / /, $logfileslist) { my $llogfile= $logfile; + $llogfile =~ s,^\Q$fs_prefix\E,,; $llogfile =~ s,/,-,g; - $llogfile= hostnamepath($lho)."--$llogfile"; + $llogfile= hostnamepath($lho)."-$out_prefix-$llogfile"; logm("fetching $logfile to $llogfile"); if (!eval { target_getfile_root($lho,60, $logfile,"$stash/$llogfile"); -- 2.11.0