From ce1c1e7a8b4719876ca28bf38234069725f3c1ef Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 28 Jan 2020 16:41:44 +0100
Subject: [PATCH] meson: convert check-decodetree
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 2 ++
tests/Makefile.include | 9 +--------
tests/meson.build | 4 ++++
3 files changed, 7 insertions(+), 8 deletions(-)
create mode 100644 tests/meson.build
diff --git a/meson.build b/meson.build
index 528198b6bde..6384401e9f5 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')
@@ -384,6 +385,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 f277d238fbe..12b0316a72d 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
@@ -969,7 +962,7 @@ check-clean:
rm -f tests/qtest/dbus-vmstate1-gen-timestamp
rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR)
-check: check-block check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
+check: check-block check-qapi-schema check-unit check-softfloat check-qtest
clean: check-clean
diff --git a/tests/meson.build b/tests/meson.build
new file mode 100644
index 00000000000..5c52021dc90
--- /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')
--
GitLab