[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/16] scripts/mtest2make.py: export all-%s-targets variable and u
From: |
Alex Bennée |
Subject: |
[PULL 13/16] scripts/mtest2make.py: export all-%s-targets variable and use it |
Date: |
Mon, 8 Feb 2021 12:38:18 +0000 |
There are some places where the conditional makefile support is the
simplest solution. Now we don't expose CONFIG_TCG as a variable create
a new one that can be checked for the check-help output.
As check-tcg is a PHONY target we re-use check-softfloat to gate that
as well.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210202134001.25738-13-alex.bennee@linaro.org>
diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
index 25ee6887cf..cbbcba100d 100644
--- a/scripts/mtest2make.py
+++ b/scripts/mtest2make.py
@@ -110,6 +110,7 @@ def emit_suite(name, suite, prefix):
print('ifneq ($(filter %s %s, $(MAKECMDGOALS)),)' % (target, prefix))
print('.tests += $(.test.$(SPEED).%s)' % (target, ))
print('endif')
+ print('all-%s-targets += %s' % (prefix, target))
targets = {t['id']: [os.path.relpath(f) for f in t['filename']]
for t in introspect['targets']}
diff --git a/tests/Makefile.include b/tests/Makefile.include
index ceaf3f0d6e..17dafdfe98 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -12,7 +12,7 @@ check-help:
@echo " $(MAKE) check-speed Run qobject speed tests"
@echo " $(MAKE) check-qapi-schema Run QAPI schema tests"
@echo " $(MAKE) check-block Run block tests"
-ifeq ($(CONFIG_TCG),y)
+ifneq ($(filter $(all-check-targets), check-softfloat),)
@echo " $(MAKE) check-tcg Run TCG tests"
@echo " $(MAKE) check-softfloat Run FPU emulation tests"
endif
--
2.20.1
- [PULL 00/16] testing, gdbstub and doc tweaks, Alex Bennée, 2021/02/08
- [PULL 02/16] tests/docker: Fix _get_so_libs() for docker-binfmt-image, Alex Bennée, 2021/02/08
- [PULL 05/16] tests/docker: preserve original name when copying libs, Alex Bennée, 2021/02/08
- [PULL 11/16] gdbstub: Fix handle_query_xfer_auxv, Alex Bennée, 2021/02/08
- [PULL 04/16] tests/docker: make _copy_with_mkdir accept missing files, Alex Bennée, 2021/02/08
- [PULL 08/16] configure: make version_ge more tolerant of shady version input, Alex Bennée, 2021/02/08
- [PULL 03/16] tests/docker: Fix typo in help message, Alex Bennée, 2021/02/08
- [PULL 12/16] tests/tcg: Replace /bin/true by true (required on macOS), Alex Bennée, 2021/02/08
- [PULL 07/16] tests/docker: add a docker-exec-copy-test, Alex Bennée, 2021/02/08
- [PULL 06/16] tests/docker: alias docker-help target for consistency, Alex Bennée, 2021/02/08
- [PULL 13/16] scripts/mtest2make.py: export all-%s-targets variable and use it,
Alex Bennée <=
- [PULL 01/16] tests/acceptance: Increase the timeout in the replay tests, Alex Bennée, 2021/02/08
- [PULL 10/16] tests/tcg: don't silently skip the gdb tests, Alex Bennée, 2021/02/08
- [PULL 09/16] configure: bump the minimum gdb version for check-tcg to 9.1, Alex Bennée, 2021/02/08
- [PULL 15/16] docs/system: document an example vexpress-a15 invocation, Alex Bennée, 2021/02/08
- [PULL 16/16] docs/system: document an example booting the versatilepb machine, Alex Bennée, 2021/02/08
- [PULL 14/16] tests/Makefile.include: don't use TARGET_DIRS for check-tcg, Alex Bennée, 2021/02/08
- Re: [PULL 00/16] testing, gdbstub and doc tweaks, Peter Maydell, 2021/02/08