ts-xen-build: run `make build' before `make', by default

The Xen build system has some quirks.  One of them is that `make' is a
version of `make dist' which is a version of `make install', which
runs `make install' in each subdir - but there are subdirs where `make
install' is a no-op which does not depend on `make build'.  Also,
`make all' does not do `make build'.  Additionally, the default target
differs in the toplevel, compared to subdirectories.  Perhaps this is
all mistaken, but it's not something we can correct in stable
branches.

The result is that we might miss bugs where `make build' fails; and in
particular, bugs where simply `make' may fail in a subdirectory.  Eg,
the recently discovered build failures in the emulator tests, due to
backported changes, which occur with `make -C tools' but not with
`make all' or `make tools'.

Detect these by running `make build' before `make' (unless our caller
has specified some other build arguments).  In the future perhaps we
should do tools and hypervisor builds entirely separately.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: Use `make build' instead of `make all' since the former actually
    detects the bug in a buggy unpatched Xen 4.8.  Fix a syntax
    error.  Improve the commit message.

diff --git a/ts-xen-build b/ts-xen-build
index c5d2a1da95bc0ba15303bf2ca4aaf9683ad9467b..4bf2428ecfad6782b8be23de84fdbcffe8bf5c85 100755 (executable)
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -160,7 +160,13 @@ END
             fi
 END
 
-    buildcmd_stamped_logged(9000, 'xen', 'build', '',<<END,'');
+    if (!@make_args) {
+       buildcmd_stamped_logged(9000, 'xen', 'build', '',<<END,'');
+            $make_prefix make $makeflags build
+END
+    }
+
+    buildcmd_stamped_logged(9000, 'xen', 'all', '',<<END,'');
             $make_prefix make $makeflags @make_args
 END