Running the iotests during "make check" is causing more headaches than
benefits for the block layer maintainers, so let's disable the iotests
during "make check" again.
Signed-off-by: Thomas Huth <th...@redhat.com>
---
tests/Makefile.include | 2 +-
tests/qemu-iotests/group | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 3543451ed3..5d19f39ee7 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -1172,7 +1172,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y))
check-tests/qapi-schema/doc-good.texi
check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
check-block: $(patsubst %,check-%, $(check-block-y))
-check: check-block check-qapi-schema check-unit check-softfloat check-qtest
check-decodetree
+check: check-qapi-schema check-unit check-softfloat check-qtest
check-decodetree
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))
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 5d3da937e4..246cf9aa65 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -10,7 +10,7 @@
#
# - img : Tests in this group can be used to excercise the qemu-img tool.
#
-# - auto : Tests in this group are used during "make check" and should be
+# - auto : Tests in this group are usable in all environments and should be
# runnable in any case. That means they should run with every QEMU binary
# (also non-x86), with every QEMU configuration (i.e. must not fail if
# an optional feature is not compiled in - but reporting a "skip" is ok),
--
2.18.1
