From patchwork Thu Aug 4 08:45:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9263011 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 AE3BD60839 for ; Thu, 4 Aug 2016 08:48:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DA3A2832E for ; Thu, 4 Aug 2016 08:48:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92A7D28335; Thu, 4 Aug 2016 08:48:41 +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 4822D2832E for ; Thu, 4 Aug 2016 08:48:41 +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 1bVEI2-0006R6-5o; Thu, 04 Aug 2016 08:46:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bVEI0-0006Qz-Q1 for xen-devel@lists.xenproject.org; Thu, 04 Aug 2016 08:46:04 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 1C/02-03032-CC003A75; Thu, 04 Aug 2016 08:46:04 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHRDpO5phsX hBl+nall83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBlzJ/SyFWzlrVg2+w5zA+Nsri5GDg4JAX+J 1asYuxg5OdgElCV+dvaygdgiAnoSTQeeg8WZBewkmh99YAGxhYHKZ13dwQRiswioSKy/uYYZx OYVcJKY17gVrFdCQE7i/PGfYHFOAWeJo5cfs4LYQkA19z7Ph7IVJDqmH2OC6BWUODnzCQvELg mJgy9eMEPM4Za4fXoq8wRGvllIymYhKVvAyLSKUaM4tagstUjX0FwvqSgzPaMkNzEzR9fQwFQ vN7W4ODE9NScxqVgvOT93EyMwpBiAYAfjxdOehxglOZiURHlzUheFC/El5adUZiQWZ8QXleak Fh9ilOHgUJLg/fkfKCdYlJqeWpGWmQMMbpi0BAePkghvHUiat7ggMbc4Mx0idYpRUUqcVxAYE 0ICIImM0jy4NlhEXWKUlRLmZQQ6RIinILUoN7MEVf4VozgHo5IwbwfIeJ7MvBK46a+AFjMBLT 5hsABkcUkiQkqqgZFB04P7ovYHPc/bsk/m34mweBMevob5S+l/z6aHE/aL57j18yvUK+1Riy2 pPXn4RVCl8bQ/f1hPZk74lep8blt+T9nRo4eK1Cx/T5mTvaB+54rSxFCxbXbcBmq7eVkUJ/1+ f3Azi4ZAn1T0pftJX8NP+v5o/PQxXVJD9rVwzJtSw+U34tweVSqxFGckGmoxFxUnAgAb3ta9o wIAAA== X-Env-Sender: prvs=017ac68b9=wei.liu2@citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1470300362!49242896!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: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56117 invoked from network); 4 Aug 2016 08:46:03 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 4 Aug 2016 08:46:03 -0000 X-IronPort-AV: E=Sophos;i="5.28,469,1464652800"; d="scan'208";a="370270084" From: Wei Liu To: Xen-devel Date: Thu, 4 Aug 2016 09:45:48 +0100 Message-ID: <1470300360-4435-3-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1470300360-4435-1-git-send-email-wei.liu2@citrix.com> References: <1470300360-4435-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: ian.jackson@eu.citrix.com, Wei Liu Subject: [Xen-devel] [OSSTEST PATCH RFC 02/14] TestSupport: factor out target_jobdir_subdir 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 Returns a path inside job-specific directory with leafname subdir. It will be used to return the distribution location of xtf. No functional change. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- Osstest/TestSupport.pm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 39d1c08..4f12ea1 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -64,7 +64,7 @@ BEGIN { target_run_apt target_install_packages target_install_packages_norec target_jobdir target_extract_jobdistpath_subdir - target_extract_jobdistpath + target_extract_jobdistpath target_jobdir_subdir lv_create lv_dev_mapper poll_loop tcpconnect await_tcp @@ -2175,14 +2175,20 @@ sub target_jobdir ($) { return $jobdir; } +# returns a path inside job-specific dir with leafname $subdir on $ho +sub target_jobdir_subdir($$) { + my ($ho, $subdir) = @_; + my $jobdir = target_jobdir($ho); + return "$jobdir/$subdir"; +} + sub target_extract_jobdistpath_subdir ($$$$) { my ($ho, $subdir, $distpart, $buildjob) = @_; # Extracts dist part $distpart from job $buildjob into an # job-specific directory with leafname $subdir on $ho, and returns # the directory's pathname. Does not need root. - my $jobdir = target_jobdir($ho); - my $distdir = "$jobdir/$subdir"; + my $distdir = target_jobdir_subdir($ho, $subdir); target_cmd($ho,"rm -rf $distdir && mkdir $distdir",60); my $path = get_stashed("path_${distpart}dist", $buildjob);