Makefile: Build livepatch test-cases.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/Makefile b/Makefile
index e9788e1b9382451fe9fa4f0b69e4c6f7a82c20a1..d57762ea6c8e1ba952a2b46883abb99df6c1a83b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -179,6 +179,9 @@ ifeq ($(ARCH),i386)
        touch xen/xen/xen.gz
 else
        $(MAKE) -C xen $(XEN_OPTS) xen -j$$(($(NCPUS) * 2))
+       if [ $(XEN_MINOR) -gt 6 ]; then \
+               $(MAKE) -C xen/xen $(XEN_OPTS) tests -j$$(($(NCPUS) * 2)); \
+       fi
 endif
 
        $(INSTALL_DIR) dist/common/

diff --git a/root_image/Makefile b/root_image/Makefile
index d41f12851e3296695b9490aecf4d2ebae08f46ab..3f7dcfe0f51d5cabd0f0ebb02951ccdf27b9cc2d 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -945,7 +945,14 @@ xend-install: yajl-depend xen-4.2-depend xen-python-bytecode
 #      prune usr/include after copy
        rm -rf userspace/usr/include
        if [ -d userspace/usr/lib/debug ]; then \
-               rm -rf userspace/usr/lib/debug/xen*; \
+               rm -rf userspace/usr/lib/debug/xen-syms; \
+       fi
+       if [ $(XEN_VERSION) -gt 6 ]; then \
+               if [ $(XEN_VERSION) -gt 8 ]; then \
+                       cp -rdf $(XEN_SRC)/xen/test/livepatch/*.livepatch userspace/usr/lib/debug/; \
+               else \
+                       cp -rdf $(XEN_SRC)/xen/arch/x86/test/*.livepatch userspace/usr/lib/debug/; \
+               fi; \
        fi
 ifeq ($(RPM_ARCH), x86_64)
        if ! test -f userspace/usr/lib64/xen; then \