From patchwork Tue Sep 24 14:42:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11159023 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 152F51668 for ; Tue, 24 Sep 2019 14:44:18 +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 E375B20640 for ; Tue, 24 Sep 2019 14:44:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="BhwAxj2a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E375B20640 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=none 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 1iCm1l-0001fb-NW; Tue, 24 Sep 2019 14:42:53 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iCm1k-0001fN-9d for xen-devel@lists.xenproject.org; Tue, 24 Sep 2019 14:42:52 +0000 X-Inumbo-ID: 957576da-ded9-11e9-961f-12813bfff9fa Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by localhost (Halon) with ESMTPS id 957576da-ded9-11e9-961f-12813bfff9fa; Tue, 24 Sep 2019 14:42:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1569336171; h=from:to:cc:subject:date:message-id:mime-version; bh=w8e/5QnstS2C28IHKsjUjQg4FvjAqxAkYZoL0yOOAk4=; b=BhwAxj2a26qsxJY9N/DWGSS/Roq2muONNxa9ORpFP3Zw4T2XBIZZnzGs 9ocoml9A++6YzA6rtHbVMObqIXbp4Spy1ZFp4N0oURzlzbc1u7szOQzlc ZNmnRWRCms6r/fh5QgznGYpKjtC0gZHRgqjDTAESnWPgJSgSPqm9zfRKU M=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=ian.jackson@eu.citrix.com; spf=Pass smtp.mailfrom=Ian.Jackson@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of ian.jackson@eu.citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa1.hc3370-68.iphmx.com: domain of Ian.Jackson@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="Ian.Jackson@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 9J4vNkbfQ8fvVScciNmI39Q3B97MBd2x0IdLLDap+Ua3pY4wjbDkd+LgewIafWZPc1NG3k7dMd H67vGEZlNBEOPvQ2uqr4LKvjqhLgbuFMLqE5lul41sJvCoDjxQpZymVmmDu5l6OA2kWGGqtIXk Q0DCxXG4ZWub49TwmHTmy1RrEua9SIlQQ249281w7CDkOTBAJo8KmjqEdDeaxWNw/td5YaxWXB 6jlgMQgqvAV0yNECcw0EDO0b2vTs9tTFOtZfk9rePfphxugcJqeYBXzTSHb+RYfwYuvZqXy94g Ems= X-SBRS: 2.7 X-MesageID: 6059108 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,544,1559534400"; d="scan'208";a="6059108" From: Ian Jackson To: Date: Tue, 24 Sep 2019 15:42:41 +0100 Message-ID: <20190924144244.7940-1-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 1/4] TestSupport: Break out target_getfile_something_stash 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" No functional change. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index e554af38..896e275e 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -565,13 +565,17 @@ sub target_getfile_root ($$$$) { my ($ho,$timeout, $rsrc,$ldst) = @_; tgetfileex('root', @_); } -sub target_getfile_root_stash ($$$;$) { - my ($ho,$timeout,$rsrc, $lleaf) = @_; # => full path of local file +sub target_getfile_something_stash ($$$$;$) { + my ($tgf,$ho,$timeout,$rsrc, $lleaf) = @_; # => full path of local file target_somefile_leaf(\$lleaf, $rsrc, $ho); open_unique_stashfile(\$lleaf); # discard filehandle, leave file my $lfile = "$stash/$lleaf"; - target_getfile_root($ho,$timeout,$rsrc,$lfile); + $tgf->($ho,$timeout,$rsrc,$lfile); return $lfile; +} +sub target_getfile_root_stash ($$$;$) { + my ($ho,$timeout,$rsrc, $lleaf) = @_; # => full path of local file + &target_getfile_something_stash(\&target_getfile_root, @_); } sub tputfileex {