[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 140/142] meson: convert check-decodetree
From: |
Paolo Bonzini |
Subject: |
[PATCH 140/142] meson: convert check-decodetree |
Date: |
Tue, 28 Jan 2020 18:53:40 +0100 |
---
tests/Makefile.include | 9 +--------
tests/meson.build | 5 +++++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 86da369aa0..76bf33bb74 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -1125,13 +1125,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
@@ -1174,7 +1167,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
.PHONY: check-qapi-schema check-qtest check-unit check check-clean
check-qapi-schema: check-tests/qapi-schema/frontend
check-tests/qapi-schema/doc-good.texi
check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
-check: check-qapi-schema check-unit check-softfloat check-qtest
check-decodetree
+check: check-qapi-schema check-unit check-softfloat check-qtest
check-clean:
rm -rf $(check-unit-y) tests/*.o
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST),
$(check-qtest-$(target)-y)) $(check-qtest-generic-y))
diff --git a/tests/meson.build b/tests/meson.build
index a546d91c17..b742188436 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,3 +1,8 @@
if have_system and 'CONFIG_POSIX' in config_host
subdir('qemu-iotests')
endif
+
+test('decodetree', files('decode/check.sh'),
+ args: [ config_host['PYTHON'], files('../scripts/decodetree.py') ],
+ workdir: meson.current_source_dir() / 'decode',
+ suite: 'decodetree')
--
2.21.0
- [PATCH 129/142] meson: install blobs, (continued)
- [PATCH 129/142] meson: install blobs, Paolo Bonzini, 2020/01/28
- [PATCH 132/142] meson: install desktop file, Paolo Bonzini, 2020/01/28
- [PATCH 131/142] meson: install icons, Paolo Bonzini, 2020/01/28
- [PATCH 133/142] meson: convert pc-bios/keymaps/Makefile, Paolo Bonzini, 2020/01/28
- [PATCH 134/142] meson: convert po/, Paolo Bonzini, 2020/01/28
- [PATCH 137/142] meson: convert pc-bios/optionrom, Paolo Bonzini, 2020/01/28
- [PATCH 136/142] meson: convert pc-bios/s390-ccw, Paolo Bonzini, 2020/01/28
- [PATCH 135/142] meson: replace mostly useless pc-bios/Makefile, Paolo Bonzini, 2020/01/28
- [PATCH 138/142] rules.mak: drop unneeded macros, Paolo Bonzini, 2020/01/28
- [PATCH 139/142] meson: convert check-block, Paolo Bonzini, 2020/01/28
- [PATCH 140/142] meson: convert check-decodetree,
Paolo Bonzini <=
- [PATCH 142/142] meson: convert check-qapi-schema, Paolo Bonzini, 2020/01/28
- [PATCH 141/142] meson: convert tests/fp and check-softfloat, Paolo Bonzini, 2020/01/28