| Message ID | 20191030144926.11873-9-alxndr@bu.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add virtual device fuzzing support | expand |
On Wed, Oct 30, 2019 at 02:49:54PM +0000, Oleinik, Alexander wrote: >From: Alexander Oleinik <alxndr@bu.edu> > >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 Oleinik <alxndr@bu.edu> Reviewed-by: Darren Kenny <darren.kenny@oracle.com> >--- > tests/Makefile.include | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > >diff --git a/tests/Makefile.include b/tests/Makefile.include >index 34ec03391c..67853d10c3 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 >@@ -873,6 +872,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 >-- >2.23.0 > >
diff --git a/tests/Makefile.include b/tests/Makefile.include index 34ec03391c..67853d10c3 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 @@ -873,6 +872,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