On 04/10/19 14:20, Peter Maydell wrote: > On Wed, 2 Oct 2019 at 18:07, Paolo Bonzini <pbonz...@redhat.com> wrote: >> >> From: Thomas Huth <th...@redhat.com> >> >> When running "make distclean" we currently leave a lot of generated >> files in the build directory. Fix that. >> >> Signed-off-by: Thomas Huth <th...@redhat.com> >> Reviewed-by: John Snow <js...@redhat.com> >> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> >> --- > >> diff --git a/tests/Makefile.include b/tests/Makefile.include >> index 3543451..48b52da 100644 >> --- a/tests/Makefile.include >> +++ b/tests/Makefile.include >> @@ -1176,11 +1176,21 @@ check: check-block check-qapi-schema check-unit >> check-softfloat check-qtest chec >> check-clean: >> rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) >> rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), >> $(check-qtest-$(target)-y)) $(check-qtest-generic-y)) >> - rm -f tests/test-qapi-gen-timestamp >> rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) >> + rm -f tests/qemu-iotests/common.env tests/qemu-iotests/check.* >> + rm -f tests/test-qapi-gen-timestamp tests/qht-bench$(EXESUF) \ >> + tests/fp/fp-test tests/fp/*.out tests/qapi-schema/*.test.* >> >> clean: check-clean > > Hi; this change breaks the sequence > 'make clean; make; make check' > > because now 'make clean' removes tests/qemu-iotests/common.env. > But this file is created by 'configure', not by 'make', so if there's > no other reason why 'make' needs to re-run configure then we get > to the 'make check' stage with the file not existing, and then > when we try to run the iotests they fail with: > > ./check: line 60: > /home/petmay01/linaro/qemu-for-merges/build/alldbg/tests/qemu-iotests/common.env: > No such file or directory > check: failed to source common.env (make sure the qemu-iotests are run > from tests/qemu-iotests in the build tree) > /home/petmay01/linaro/qemu-for-merges/tests/Makefile.include:1102: > recipe for target 'check-tests/check-block.sh' failed > > thanks > -- PMM >
I've dropped this patch and will send v3 that adds back the VMX patches. Paolo
