[OSSTEST PATCH 08/13] rump kernel tests: Do a xen.git tools build

[Ian Jackson <ian.jackson@eu.citrix.com>]

Having laid the groundwork, we can now:

* In make-flight, for the rumpuserxen builds, set the runvars that
  specify which xen.git bits etc. to build.  (We pass qemuu now,
  because we intend that eventually we will want to build that too.)

* In ts-rumpuserxen-build, record the locations of the app-tools
  configure and make wrappers in the runvars which will be honoured by
  ts-xen-build.  Thus ts-xen-build in rumpuserxen build jobs will use
  these app-tools and do a rump cross build.

* Add a ts-xen-build step to the build-rumpuserxen recipe, passing
  `tools' as the target to build.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 mfi-common           |    4 ++++
 sg-run-job           |    1 +
 ts-rumpuserxen-build |    7 +++++++
 3 files changed, 12 insertions(+)

diff --git a/mfi-common b/mfi-common
index 2055bab..aba0b15 100644
--- a/mfi-common
+++ b/mfi-common
@@ -204,6 +204,10 @@ create_build_jobs () {
                 tree_rumpuserxen=$TREE_RUMPUSERXEN			\
           ${TREEVCS_RUMPUSERXEN:+treevcs_rumpuserxen=}${TREEVCS_RUMPUSERXEN} \
                 revision_rumpuserxen=$REVISION_RUMPUSERXEN		\
+                tree_xen=$TREE_XEN                                           \
+                tree_qemuu=$TREE_QEMU_UPSTREAM                               \
+                revision_xen=$REVISION_XEN                                   \
+                revision_qemuu=$REVISION_QEMU_UPSTREAM                       \
                 tree_rumpuserxen_rumpsrc=$TREE_RUMPUSERXEN_RUMPSRC	\
                 ${TREEVCS_RUMPUSERXEN_RUMPSRC:+treevcs_rumpuserxen_rumpsrc=}${TREEVCS_RUMPUSERXEN_RUMPSRC}
                 # rumpsrc-related runvars needed only for old rumpuser-xen
diff --git a/sg-run-job b/sg-run-job
index b02a755..ab9f333 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -338,6 +338,7 @@ proc run-job/build-libvirt {} {
 
 proc run-job/build-rumpuserxen {} {
     run-ts . = ts-rumpuserxen-build
+    run-ts . = ts-xen-build + host tools
 }
 
 proc prepare-build-host {} {
diff --git a/ts-rumpuserxen-build b/ts-rumpuserxen-build
index a1f31cd..e0b18a7 100755
--- a/ts-rumpuserxen-build
+++ b/ts-rumpuserxen-build
@@ -97,6 +97,12 @@ sub build() {
 END
 }
 
+sub recordtools() {
+    my $apptool = "$rux/app-tools/rumpxen-app";
+    store_runvar('cmdprefix_configure', "$apptool-configure");
+    store_runvar('cmdprefix_make',      "$apptool-make");
+}
+
 sub install() {
     my $destdir="dist/usr/local/lib/xen/rump-kernel";
     target_cmd_build($ho, 300, $builddir, <<END);
@@ -110,5 +116,6 @@ END
 checkout();
 massage();
 build();
+recordtools();
 install();
 built_stash($ho, $builddir, 'dist', 'rumpuserxendist');
-- 
1.7.10.4