On 16/07/2019 17.37, Max Reitz wrote: > On 16.07.19 14:28, Thomas Huth wrote: >> People often forget to run the iotests before submitting patches or pull >> requests - this is likely due to the fact that we do not run the tests >> during our mandatory "make check" tests yet. Now that we've got a proper >> "auto" group of iotests that should be fine to run in every environment, >> we can enable the iotests during "make check" again by running the "auto" >> tests by default from the check-block.sh script. >> >> Some cases still need to be checked first, though: iotests need bash and >> GNU sed (otherwise they fail), and if gprof is enabled, it spoils the >> output of some test cases causing them to fail. So if we detect that one >> of the required programs is missing or that gprof is enabled, we still >> have to skip the iotests to avoid failures. >> >> And finally, since we are using check-block.sh now again, this patch also >> removes the qemu-iotests-quick.sh script since we do not need that anymore >> (and having two shell wrapper scripts around the block tests seems rather >> confusing than helpful). >> >> Signed-off-by: Thomas Huth <th...@redhat.com> >> [AJB: -makecheck to check-block.sh, move check-block to start and gate it] >> Signed-off-by: Alex Bennée <alex.ben...@linaro.org> >> --- >> tests/Makefile.include | 8 +++---- >> tests/check-block.sh | 44 ++++++++++++++++++++++++++++--------- >> tests/qemu-iotests-quick.sh | 8 ------- >> 3 files changed, 38 insertions(+), 22 deletions(-) >> delete mode 100755 tests/qemu-iotests-quick.sh >> >> diff --git a/tests/Makefile.include b/tests/Makefile.include >> index fd7fdb8658..e868dc1b9c 100644 >> --- a/tests/Makefile.include >> +++ b/tests/Makefile.include > > [...] > >> @@ -1092,8 +1092,8 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) >> >> QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = >> tests/qemu-iotests/socket_scm_helper$(EXESUF) >> >> -.PHONY: check-tests/qemu-iotests-quick.sh >> -check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh >> qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) >> $(QEMU_IOTESTS_HELPERS-y) >> +.PHONY: check-tests/check-block.sh >> +check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) >> qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) > > Does this need to depend on a full qemu binary, too?
Yes, I guess so ... otherwise you can not run "make check-block" immediately after doing a "configure" in a fresh directory. I'll try to figure out the necessary Makefile magic for this... Thomas
signature.asc
Description: OpenPGP digital signature
