aboutsummaryrefslogtreecommitdiff
path: root/tests/Makefile.include
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2022-03-10 08:50:48 +0100
committerHanna Reitz <hreitz@redhat.com>2022-03-22 09:40:54 +0100
commite287072b40c8928ed54c275f1e548a9009394ecf (patch)
treef55da8e4fc379f508270a0aea4e2220f145009f2 /tests/Makefile.include
parentab101297cb120a73c4ef1646fb09438f7f590f34 (diff)
downloadqemu-e287072b40c8928ed54c275f1e548a9009394ecf.zip
qemu-e287072b40c8928ed54c275f1e548a9009394ecf.tar.gz
qemu-e287072b40c8928ed54c275f1e548a9009394ecf.tar.bz2
tests: Do not treat the iotests as separate meson test target anymore
If there is a failing iotest, the output is currently not logged to the console anymore. To get this working again, we need to run the meson test runner with "--print-errorlogs" (and without "--verbose" due to a current meson bug that will be fixed here: https://github.com/mesonbuild/meson/commit/c3f145ca2b9f5.patch ). We could update the "meson test" call in tests/Makefile.include, but actually it's nicer and easier if we simply do not treat the iotests as separate test target anymore and integrate them along with the other test suites. This has the disadvantage of not getting the detailed progress indication there anymore, but since that was only working right in single-threaded "make -j1" mode anyway, it's not a huge loss right now. Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <20220310075048.2303495-1-thuth@redhat.com> Tested-by: Hanna Reitz <hreitz@redhat.com> Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Diffstat (limited to 'tests/Makefile.include')
-rw-r--r--tests/Makefile.include9
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include
index e7153c8..b89018c 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -147,16 +147,9 @@ check-acceptance: check-acceptance-deprecated-warning | check-avocado
# Consolidated targets
-.PHONY: check-block check check-clean get-vm-images
+.PHONY: check check-clean get-vm-images
check:
-ifneq ($(.check-block.deps),)
-check: check-block
-check-block: run-ninja
- $(if $(MAKE.n),,+)$(MESON) test $(MTESTARGS) $(.mtestargs) --verbose \
- --logbase iotestslog $(call .speed.$(SPEED), block block-slow block-thorough)
-endif
-
check-build: run-ninja
check-clean: