[Xen-devel] [PATCH OSSTEST] ts-xen-build: Do not set QEMU_REMOTE unless $r{tree_qemu} is set

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

4.4 and earlier do not check if QEMU_REMOTE is empty before using it.
From 4.5 onwards if QEMU_REMOTE is empty then default is used.

This should fix the build-*-prev job for 4.5 and earlier. In this job
we deliberately don't specify tree_qemu since we want whatever
that branch gives us.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 ts-xen-build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ts-xen-build b/ts-xen-build
index cebfaf3..b02e737 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -52,12 +52,14 @@ sub checkout () {
        echo >>.config debug=$debug_build
        echo >>.config GIT_HTTP=y
        echo >>.config LIBLEAFDIR_x86_64=lib
-       echo >>.config QEMU_REMOTE='$r{tree_qemu}'
        echo >>.config KERNELS=''
 END
                (nonempty($r{enable_xsm}) ? <<END : '').
        echo >>.config XSM_ENABLE='${build_xsm}'
 END
+               (nonempty($r{tree_qemu}) ? <<END : '').
+       echo >>.config QEMU_REMOTE='$r{tree_qemu}'
+END
                (nonempty($r{revision_qemu}) ? <<END : '').
        echo >>.config QEMU_TAG='$r{revision_qemu}'
 END
-- 
2.5.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel