From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Jackson <ian.jackson@eu.citrix.com>
Subject: [OSSTEST PATCH 05/13] TestSupport: Break out
	target_jobdir
Date: Fri, 16 May 2014 19:01:32 +0100
Message-ID: <1400263300-22903-6-git-send-email-ian.jackson@eu.citrix.com>
References: <1400263300-22903-1-git-send-email-ian.jackson@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <Ian.Jackson@citrix.com>) id 1WlMSf-0002E7-Fv
	for xen-devel@lists.xenproject.org; Fri, 16 May 2014 18:02:25 +0000
In-Reply-To: <1400263300-22903-1-git-send-email-ian.jackson@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>, Ian Campbell <ian.campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Osstest/BuildSupport.pm |    6 +-----
 Osstest/TestSupport.pm  |    8 ++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Osstest/BuildSupport.pm b/Osstest/BuildSupport.pm
index 9a43f00..d5fb677 100644
--- a/Osstest/BuildSupport.pm
+++ b/Osstest/BuildSupport.pm
@@ -66,11 +66,7 @@ sub builddirsprops {
     my (%xbuildopts) = @_;
 
     $xbuildopts{DefMakeFlags} ||= '-j4';
-
-    my $leaf= "build.$flight.$job";
-    my $homedir = get_host_property($ho, 'homedir', '/home/osstest');
-    $builddir= "$homedir/$leaf";
-
+    $builddir= target_jobdir($ho);
     $makeflags= get_host_property($ho, 'build make flags',
 				  $xbuildopts{DefMakeFlags});
 }
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 49bb175..96454d3 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -58,6 +58,7 @@ BEGIN {
                       target_editfile_root target_file_exists
                       target_run_apt
                       target_install_packages target_install_packages_norec
+                      target_jobdir
                       target_extract_jobdistpath target_guest_lv_name
 
                       poll_loop tcpconnect await_tcp
@@ -1706,6 +1707,13 @@ END
     return $console;
 }
 
+sub target_jobdir ($) {
+    my ($ho) = @_;
+    my $leaf= "build.$flight.$job";
+    my $homedir = get_host_property($ho, 'homedir', '/home/osstest');
+    return "$homedir/$leaf";
+}
+
 sub target_extract_jobdistpath ($$$$$) {
     my ($ho, $part, $path, $job, $distpath) = @_;
     $distpath->{$part}= get_stashed($path, $job);
-- 
1.7.10.4