From patchwork Sat Jul 8 07:46:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 9831413 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 C7089603B5 for ; Sat, 8 Jul 2017 07:50:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC9E628549 for ; Sat, 8 Jul 2017 07:50:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B182928564; Sat, 8 Jul 2017 07:50:30 +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 510A428549 for ; Sat, 8 Jul 2017 07:50:30 +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 1dTkT6-0008Tu-SC; Sat, 08 Jul 2017 07:47:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dTkT6-0008Tm-EK for xen-devel@lists.xenproject.org; Sat, 08 Jul 2017 07:47:56 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 3D/D0-01987-B2E80695; Sat, 08 Jul 2017 07:47:55 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRWlGSWpSXmKPExsXitHRDpK5WX0K kwaMGW4vvWyYzOTB6HP5whSWAMYo1My8pvyKBNWP+lE3MBY8kK16tiGxgfCvSxcjJISHgL3H2 wA9GEJtNQEfi4tydbF2MHBwiAioSt/cagISZBdwl7lxYxARiCwtES+xYeJYdxGYBKnn16xYLi M0rYCnx7+YsRoiRehJvJ74AszkFrCRuTjkJViMEVHNqzxYmiHpBiZMzn7BAzNeUaN3+mx3Clp do3jqbGaJeUaJ/3gO2CYx8s5C0zELSMgtJywJG5lWMGsWpRWWpRbqGJnpJRZnpGSW5iZk5uoY Gxnq5qcXFiempOYlJxXrJ+bmbGIGBxgAEOxhXbPc8xCjJwaQkyivWmxApxJeUn1KZkVicEV9U mpNafIhRhoNDSYL3Vw9QTrAoNT21Ii0zBxjyMGkJDh4lEd4nOkBp3uKCxNzizHSI1ClGY44Nq 9d/YeJ4NeH/NyYhlrz8vFQpcd7VIJMEQEozSvPgBsFi8RKjrJQwLyPQaUI8BalFuZklqPKvGM U5GJWEeV1BbuXJzCuB2/cK6BQmoFPY6sBOKUlESEk1MHK6+c72nFf24/GhqrUxkRkNt+as3GU ZkbptrUNSnfNP6Rthi5c35ttv4fwWfn/6Wu3lf108lKYwnX2wUIWd5Yqh3NHQMyJL1AwK9mz4 e+hD5evLPRN51c3XZK/IONohIBa188qR4o41c8VfVDzIcFuQ17RTeyWTtGiEn7GpzMfOU68Xv Vec/FWJpTgj0VCLuag4EQD0ckGOwAIAAA== X-Env-Sender: prvs=355d1c376=roger.pau@citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1499500073!103868262!1 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 54485 invoked from network); 8 Jul 2017 07:47:54 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 8 Jul 2017 07:47:54 -0000 X-IronPort-AV: E=Sophos;i="5.40,327,1496102400"; d="scan'208";a="430769680" From: Roger Pau Monne To: Date: Sat, 8 Jul 2017 08:46:56 +0100 Message-ID: <20170708074712.44451-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <20170708074712.44451-1-roger.pau@citrix.com> References: <20170708074712.44451-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Ian.Jackson@eu.citrix.com, Roger Pau Monne Subject: [Xen-devel] [PATCH v5 01/17] osstest: make built_stash_file store a path_ runvar for each file 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 And introduce built_stash_debugfile in order the keep the previous behavior of built_stash_file. Signed-off-by: Roger Pau Monné Acked-by: Ian Jackson --- Osstest/TestSupport.pm | 14 ++++++++++++-- ts-kernel-build | 4 ++-- ts-xen-build | 8 ++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 6e19b28a..83f24005 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -85,7 +85,7 @@ BEGIN { get_stashed open_unique_stashfile compress_stashed dir_identify_vcs build_url_vcs build_clone - built_stash built_stash_file + built_stash built_stash_file built_stash_debugfile built_compress_stashed hg_dir_revision git_dir_revision vcs_dir_revision store_revision store_vcs_revision @@ -1495,7 +1495,7 @@ END store_runvar("path_$item", $stashleaf); } -sub built_stash_file ($$$$;$) { +sub built_stash_debugfile ($$$$;$) { my ($ho, $builddir, $item, $fname, $optional) = @_; my $build= "build"; my $stashleaf= "$build/$item"; @@ -1508,6 +1508,16 @@ sub built_stash_file ($$$$;$) { "$stash/$stashleaf"); } +sub built_stash_file ($$$$;$) { + my ($ho, $builddir, $item, $fname, $optional) = @_; + my $build= "build"; + my $stashleaf= "$build/$item"; + + built_stash_debugfile($ho, $builddir, $item, $fname, $optional); + store_runvar("path_$item", $stashleaf); +} + + sub built_compress_stashed($) { my ($path) = @_; compress_stashed("build/$path"); diff --git a/ts-kernel-build b/ts-kernel-build index 94e67a47..5b87f5a7 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -438,9 +438,9 @@ if ($r{tree_linuxfirmware}) { fwinstall(); } built_stash($ho, $builddir, 'dist', 'kerndist'); -built_stash_file($ho, $builddir, 'vmlinux', 'linux/vmlinux'); +built_stash_debugfile($ho, $builddir, 'vmlinux', 'linux/vmlinux'); built_compress_stashed('vmlinux'); -built_stash_file($ho, $builddir, 'config', 'linux/.config'); +built_stash_debugfile($ho, $builddir, 'config', 'linux/.config'); sub enable_xen_config () { return <<'END'; diff --git a/ts-xen-build b/ts-xen-build index 097ac0a5..3a4bcfa3 100755 --- a/ts-xen-build +++ b/ts-xen-build @@ -232,10 +232,10 @@ sub stash () { } built_stash($ho, $builddir, "xen/dist/xenlpt", "xenlptdist") if $enable_livepatch; - built_stash_file($ho, $builddir, "xen-syms", "xen/xen/xen-syms", 1); - built_stash_file($ho, $builddir, "xen-config", "xen/.config", 1); - built_stash_file($ho, $builddir, "xen-hv-config", "xen/xen/.config", 1); - built_stash_file($ho, $builddir, "seabios-config", + built_stash_debugfile($ho, $builddir, "xen-syms", "xen/xen/xen-syms", 1); + built_stash_debugfile($ho, $builddir, "xen-config", "xen/.config", 1); + built_stash_debugfile($ho, $builddir, "xen-hv-config", "xen/xen/.config", 1); + built_stash_debugfile($ho, $builddir, "seabios-config", "xen/tools/firmware/seabios-dir-remote/.config", 1); built_compress_stashed("xen-syms"); }