From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH OSSTEST v3 4/6] ts-xen-build: Move Xen build
	tree from xen-unstable to just xen
Date: Thu, 15 May 2014 11:30:37 +0100
Message-ID: <1400149839-8489-4-git-send-email-ian.campbell@citrix.com>
References: <1400149787.4386.29.camel@kazak.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1400149787.4386.29.camel@kazak.uk.xensource.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: ian.jackson@eu.citrix.com, xen-devel@lists.xen.org
Cc: Ian Campbell <ian.campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

It's not always xen-unstable we are testing, and I had to check that it was
the right generic name, so reduce this confusion.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 ts-xen-build | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ts-xen-build b/ts-xen-build
index 1d5d2bf..78ba806 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -37,7 +37,7 @@ my $makeflags= get_host_property($ho, 'build make flags', '-j4');
 sub checkout () {
     target_cmd($ho, "rm -rf $builddir && mkdir $builddir", 60);
 
-    build_clone($ho, 'xen', $builddir, 'xen-unstable');
+    build_clone($ho, 'xen', $builddir, 'xen');
 
     my $debug_build = $r{xen_build_debug} || 'y';
 
@@ -50,7 +50,7 @@ sub checkout () {
     my $earlyprintk = get_host_property($ho, 'EarlyPrintk', undef);
 
     target_cmd_build($ho, 100, $builddir, <<END.
-        cd $builddir/xen-unstable
+        cd $builddir/xen
 	>.config
 	echo >>.config debug=$debug_build
 	echo >>.config GIT_HTTP=y
@@ -85,7 +85,7 @@ END
 sub buildcmd_stamped_logged ($$$$$) {
     my ($timeout, $stampname, $prefix, $cmd, $suffix) = @_;
     target_cmd_build($ho, $timeout, $builddir, <<END);
-        cd xen-unstable
+        cd xen
         $prefix
         ( $cmd 2>&1 &&             touch ../$stampname-ok-stamp
         ) |tee ../$stampname-log
@@ -120,7 +120,7 @@ END
 }
 
 sub collectversions () {
-    my $tools="$builddir/xen-unstable/tools";
+    my $tools="$builddir/xen/tools";
     store_revision($ho, 'qemu', "$tools/ioemu-dir", 1);
     store_revision($ho, 'qemu', "$tools/qemu-xen-traditional-dir", 1);
     store_revision($ho, 'qemuu', "$tools/qemu-xen-dir", 1);
@@ -130,7 +130,7 @@ sub collectversions () {
 
 sub divide () {
     target_cmd_build($ho, 100, $builddir, <<END);
-        cd xen-unstable/dist
+        cd xen/dist
         mkdir xeninstall
 	for f in *install; do
 	    mkdir -p \$f/lib
@@ -147,13 +147,13 @@ END
 sub stash () {
     foreach my $part ('', 'xen') {
         built_stash($ho, $builddir,
-                    "xen-unstable/dist/${part}install",
+                    "xen/dist/${part}install",
                     "${part}dist");
     }
-    built_stash_file($ho, $builddir, "xen-syms", "xen-unstable/xen/xen-syms", 1);
-    built_stash_file($ho, $builddir, "xen-config", "xen-unstable/.config", 1);
+    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, "seabios-config",
-		     "xen-unstable/tools/firmware/seabios-dir-remote/.config", 1);
+		     "xen/tools/firmware/seabios-dir-remote/.config", 1);
     built_compress_stashed("xen-syms");
 }
 
-- 
1.9.0