[Xen-changelog] [xen staging] x86emul: fix test harness and fuzzer build dependencies

[patchbot@xxxxxxx]

commit 1835980fc63b353430704a36e73e93480337bde5
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Sep 10 16:35:09 2019 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Sep 10 16:35:09 2019 +0200

    x86emul: fix test harness and fuzzer build dependencies
    
    Commit fd35f32b4b ("tools/x86emul: Use struct cpuid_policy in the
    userspace test harnesses") didn't account for the dependencies of
    cpuid-autogen.h to potentially change between incremental builds. In
    particular the harness has a "run" goal which is supposed to be usable
    independently of the rest of the tools sub-tree building, and both the
    harness and the fuzzer code are also supposed to be buildable
    independently. Therefore a re-build of the generated header needs to be
    triggered first, which is achieved by introducing a new top-level target
    pattern (for just the "run" part for now).
    
    Further cpuid.o did not have any dependencies added for it.
    
    Finally, while at it, add a "run" target to the cpu-policy test harness.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Makefile                                     | 3 +++
 tools/fuzz/x86_instruction_emulator/Makefile | 6 ++++--
 tools/tests/cpu-policy/Makefile              | 4 ++++
 tools/tests/x86_emulator/Makefile            | 6 ++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ef1ea44ef1..512d6b73c8 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,9 @@ build-docs:
 test:
        $(MAKE) -C tools/python test
 
+run-tests-%: build-tools-public-headers tools/tests/%/
+       $(MAKE) -C tools/tests/$* run
+
 # For most targets here,
 #   make COMPONENT-TARGET
 # is implemented, more or less, by
diff --git a/tools/fuzz/x86_instruction_emulator/Makefile 
b/tools/fuzz/x86_instruction_emulator/Makefile
index a55bc78985..1a6dbf94e1 100644
--- a/tools/fuzz/x86_instruction_emulator/Makefile
+++ b/tools/fuzz/x86_instruction_emulator/Makefile
@@ -26,13 +26,15 @@ GCOV_FLAGS := --coverage
        $(CC) -c $(CFLAGS) $(GCOV_FLAGS) $< -o $@
 
 x86.h := $(addprefix $(XEN_ROOT)/tools/include/xen/asm/,\
-                     x86-vendors.h x86-defns.h msr-index.h)
+                     x86-vendors.h x86-defns.h msr-index.h) \
+         $(addprefix $(XEN_ROOT)/tools/include/xen/lib/x86/, \
+                     cpuid.h cpuid-autogen.h)
 x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h)
 
 # x86-emulate.c will be implicit for both
 x86-emulate.o x86-emulate-cov.o: x86_emulate/x86_emulate.c $(x86_emulate.h)
 
-fuzz-emul.o fuzz-emulate-cov.o wrappers.o: $(x86_emulate.h)
+fuzz-emul.o fuzz-emulate-cov.o cpuid.o wrappers.o: $(x86_emulate.h)
 
 x86-insn-fuzzer.a: fuzz-emul.o x86-emulate.o cpuid.o
        $(AR) rc $@ $^
diff --git a/tools/tests/cpu-policy/Makefile b/tools/tests/cpu-policy/Makefile
index 07dd58f5c2..fb548c9b9a 100644
--- a/tools/tests/cpu-policy/Makefile
+++ b/tools/tests/cpu-policy/Makefile
@@ -17,6 +17,10 @@ endif
 .PHONY: all
 all: $(TARGET-y)
 
+.PHONY: run
+run: $(TARGET-y)
+       ./$(TARGET-y)
+
 .PHONY: clean
 clean:
        $(RM) -f -- *.o .*.d .*.d2 test-cpu-policy
diff --git a/tools/tests/x86_emulator/Makefile 
b/tools/tests/x86_emulator/Makefile
index b9312e0044..a79f13f383 100644
--- a/tools/tests/x86_emulator/Makefile
+++ b/tools/tests/x86_emulator/Makefile
@@ -280,10 +280,12 @@ $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie)
 HOSTCFLAGS += $(CFLAGS_xeninclude) -I. $(HOSTCFLAGS-$(XEN_COMPILE_ARCH))
 
 x86.h := $(addprefix $(XEN_ROOT)/tools/include/xen/asm/,\
-                     x86-vendors.h x86-defns.h msr-index.h)
+                     x86-vendors.h x86-defns.h msr-index.h) \
+         $(addprefix $(XEN_ROOT)/tools/include/xen/lib/x86/, \
+                     cpuid.h cpuid-autogen.h)
 x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h)
 
-x86-emulate.o test_x86_emulator.o evex-disp8.o wrappers.o: %.o: %.c 
$(x86_emulate.h)
+x86-emulate.o cpuid.o test_x86_emulator.o evex-disp8.o wrappers.o: %.o: %.c 
$(x86_emulate.h)
        $(HOSTCC) $(HOSTCFLAGS) -c -g -o $@ $<
 
 x86-emulate.o: x86_emulate/x86_emulate.c
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog