Message ID | 20191129213424.6290-9-alxndr@bu.edu (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Add virtual device fuzzing support | expand |
On Fri, Nov 29, 2019 at 09:34:44PM +0000, Oleinik, Alexander wrote: > Before, when tests/Makefile.include was included, the contents would be > ignored if config-host.mak was defined. Moving the ifneq responsible for > this allows a target to depend on both testing-related and host-related > objects. For example the virtual-device fuzzer relies on both > libqtest/libqos objects and softmmu objects. > > Signed-off-by: Alexander Bulekov <alxndr@bu.edu> > Reviewed-by: Darren Kenny <darren.kenny@oracle.com> > --- > tests/Makefile.include | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) I've checked that "make check" is still happy when the x86_64-linux-user target is configured: Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/tests/Makefile.include b/tests/Makefile.include index 8566f5f119..3669fd1dc3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -27,7 +27,6 @@ check-help: @echo "Default options are -k and (for $(MAKE) V=1) --verbose; they can be" @echo "changed with variable GTESTER_OPTIONS." -ifneq ($(wildcard config-host.mak),) export SRC_PATH # TODO don't duplicate $(SRC_PATH)/Makefile's qapi-py here @@ -878,6 +877,8 @@ tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y) SPEED = quick +ifneq ($(wildcard config-host.mak),) + # gtester tests, possibly with verbose output # do_test_tap runs all tests, even if some of them fail, while do_test_human # stops at the first failure unless -k is given on the command line