[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/25] tests: Do not treat the iotests as separate meson test targ
From: |
Hanna Reitz |
Subject: |
[PULL 04/25] tests: Do not treat the iotests as separate meson test target anymore |
Date: |
Tue, 22 Mar 2022 12:56:26 +0100 |
From: Thomas Huth <thuth@redhat.com>
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>
---
meson.build | 6 +++---
scripts/mtest2make.py | 4 ----
tests/Makefile.include | 9 +--------
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/meson.build b/meson.build
index 282e7c4650..f71e1a1468 100644
--- a/meson.build
+++ b/meson.build
@@ -3,9 +3,9 @@ project('qemu', ['c'], meson_version: '>=0.59.3',
'b_staticpic=false', 'stdsplit=false'],
version: files('VERSION'))
-add_test_setup('quick', exclude_suites: ['block', 'slow', 'thorough'],
is_default: true)
-add_test_setup('slow', exclude_suites: ['block', 'thorough'], env:
['G_TEST_SLOW=1', 'SPEED=slow'])
-add_test_setup('thorough', exclude_suites: ['block'], env: ['G_TEST_SLOW=1',
'SPEED=thorough'])
+add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true)
+add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=1',
'SPEED=slow'])
+add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough'])
not_found = dependency('', required: false)
keyval = import('keyval')
diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
index 4d542e8aaa..304634b71e 100644
--- a/scripts/mtest2make.py
+++ b/scripts/mtest2make.py
@@ -101,10 +101,6 @@ def emit_suite(name, suite, prefix):
testsuites = defaultdict(Suite)
for test in introspect['tests']:
process_tests(test, targets, testsuites)
-# HACK: check-block is a separate target so that it runs with --verbose;
-# only write the dependencies
-emit_suite_deps('block', testsuites['block'], 'check')
-del testsuites['block']
emit_prolog(testsuites, 'check')
for name, suite in testsuites.items():
emit_suite(name, suite, 'check')
diff --git a/tests/Makefile.include b/tests/Makefile.include
index e7153c8e91..b89018cdcc 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:
--
2.35.1
- [PULL 00/25] Block patches for 7.0-rc1, Hanna Reitz, 2022/03/22
- [PULL 02/25] block/rbd: fix write zeroes with growing images, Hanna Reitz, 2022/03/22
- [PULL 03/25] tests/qemu-iotests: Use GNU sed in two more spots where it is necessary, Hanna Reitz, 2022/03/22
- [PULL 01/25] tests: add (riscv virt) machine mapping to testenv, Hanna Reitz, 2022/03/22
- [PULL 04/25] tests: Do not treat the iotests as separate meson test target anymore,
Hanna Reitz <=
- [PULL 05/25] tests/qemu-iotests/testrunner: Supply a test plan in TAP mode, Hanna Reitz, 2022/03/22
- [PULL 07/25] python/utils: add VerboseProcessError, Hanna Reitz, 2022/03/22
- [PULL 06/25] python/utils: add add_visual_margin() text decoration utility, Hanna Reitz, 2022/03/22
- [PULL 08/25] iotests: Remove explicit checks for qemu_img() == 0, Hanna Reitz, 2022/03/22
- [PULL 09/25] iotests: make qemu_img raise on non-zero rc by default, Hanna Reitz, 2022/03/22
- [PULL 11/25] iotests: add qemu_img_json(), Hanna Reitz, 2022/03/22
- [PULL 10/25] iotests: fortify compare_images() against crashes, Hanna Reitz, 2022/03/22
- [PULL 12/25] iotests: use qemu_img_json() when applicable, Hanna Reitz, 2022/03/22
- [PULL 13/25] iotests: add qemu_img_info(), Hanna Reitz, 2022/03/22
- [PULL 14/25] iotests/remove-bitmap-from-backing: use qemu_img_info(), Hanna Reitz, 2022/03/22