Signed-off-by: Paolo Bonzini <[email protected]>
---
meson.build | 2 ++
tests/Makefile.include | 8 +-------
tests/meson.build | 4 ++++
3 files changed, 7 insertions(+), 7 deletions(-)
create mode 100644 tests/meson.build
diff --git a/meson.build b/meson.build
index e5617df1b3..b884a4fcb7 100644
--- a/meson.build
+++ b/meson.build
@@ -6,6 +6,7 @@ not_found = dependency('', required: false)
keyval = import('unstable-keyval')
ss = import('sourceset')
+sh = find_program('sh')
cc = meson.get_compiler('c')
config_host = keyval.load(meson.current_build_dir() / 'config-host.mak')
@@ -380,6 +381,7 @@ endif
subdir('tools')
subdir('pc-bios')
+subdir('tests')
summary_info = {}
summary_info += {'Install prefix': config_host['prefix']}
diff --git a/tests/Makefile.include b/tests/Makefile.include
index f277d238fb..8e953a24ee 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -894,13 +894,6 @@ check-tests/qapi-schema/frontend: $(addprefix
$(SRC_PATH)/, $(check-qapi-schema-
check-tests/qapi-schema/doc-good.texi: tests/qapi-schema/doc-good.test.texi
@diff -u $(SRC_PATH)/tests/qapi-schema/doc-good.texi $<
-.PHONY: check-decodetree
-check-decodetree:
- $(call quiet-command, \
- cd $(SRC_PATH)/tests/decode && \
- ./check.sh "$(PYTHON)" "$(SRC_PATH)/scripts/decodetree.py", \
- TEST, decodetree.py)
-
# Python venv for running tests
.PHONY: check-venv check-acceptance
@@ -962,6 +955,7 @@ check-block: $(patsubst %,check-%, $(check-block-y))
endif
check-build: build-unit build-softfloat build-qtest
+check: check-block check-qapi-schema check-unit check-softfloat check-qtest
check-clean:
rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y)
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST),
$(check-qtest-$(target)-y:%=tests/qtest/%$(EXESUF)))
$(check-qtest-generic-y:%=tests/qtest/%$(EXESUF)))
diff --git a/tests/meson.build b/tests/meson.build
new file mode 100644
index 0000000000..5c52021dc9
--- /dev/null
+++ b/tests/meson.build
@@ -0,0 +1,4 @@
+test('decodetree', sh,
+ args: [ files('decode/check.sh'), config_host['PYTHON'],
files('../scripts/decodetree.py') ],
+ workdir: meson.current_source_dir() / 'decode',
+ suite: 'decodetree')
--
2.26.2
