[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 14/33] build: add a more generic way to specify make->ninja de
From: |
Alex Bennée |
Subject: |
[PATCH v1 14/33] build: add a more generic way to specify make->ninja dependencies |
Date: |
Fri, 27 May 2022 16:35:44 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Let any make target specify ninja goals that needs to be built for it
(though selecting the goals is _not_ recursive on depending targets)
instead of having a custom mechanism only for "make check" and "make
bench".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220517092616.1272238-4-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
Makefile | 3 +--
scripts/mtest2make.py | 8 ++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index fad312040f..3c0d89057e 100644
--- a/Makefile
+++ b/Makefile
@@ -145,8 +145,7 @@ NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if
$(MAKE.k), -k0) \
$(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \
-d keepdepfile
ninja-cmd-goals = $(or $(MAKECMDGOALS), all)
-ninja-cmd-goals += $(foreach t, $(.check.build-suites), $(.check-$t.deps))
-ninja-cmd-goals += $(foreach t, $(.bench.build-suites), $(.bench-$t.deps))
+ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g))))
makefile-targets := build.ninja ctags TAGS cscope dist clean uninstall
# "ninja -t targets" also lists all prerequisites. If build system
diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
index 304634b71e..0fe81efbbc 100644
--- a/scripts/mtest2make.py
+++ b/scripts/mtest2make.py
@@ -81,12 +81,12 @@ def emit_prolog(suites, prefix):
def emit_suite_deps(name, suite, prefix):
deps = ' '.join(suite.deps)
- targets = f'{prefix}-{name} {prefix}-report-{name}.junit.xml {prefix}
{prefix}-report.junit.xml'
+ targets = [f'{prefix}-{name}', f'{prefix}-report-{name}.junit.xml',
f'{prefix}', f'{prefix}-report.junit.xml',
+ f'{prefix}-build']
print()
print(f'.{prefix}-{name}.deps = {deps}')
- print(f'ifneq ($(filter {prefix}-build {targets}, $(MAKECMDGOALS)),)')
- print(f'.{prefix}.build-suites += {name}')
- print(f'endif')
+ for t in targets:
+ print(f'.ninja-goals.{t} += $(.{prefix}-{name}.deps)')
def emit_suite(name, suite, prefix):
emit_suite_deps(name, suite, prefix)
--
2.30.2
- Re: [PATCH v1 04/33] meson.build: fix summary display of test compilers, (continued)
- [PATCH v1 08/33] tests/docker: update debian-mipsel-cross with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 09/33] tests/docker: update debian-mips64el-cross with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 06/33] tests/docker: update debian-armhf-cross with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 12/33] configure: do not define or use the CPP variable, Alex Bennée, 2022/05/27
- [PATCH v1 10/33] tests/docker: update debian-ppc64el-cross with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 14/33] build: add a more generic way to specify make->ninja dependencies,
Alex Bennée <=
- [PATCH v1 07/33] tests/docker: update debian-armel-cross with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 26/33] configure: enable cross compilation of vof, Alex Bennée, 2022/05/27
- [PATCH v1 18/33] tests/tcg: merge configure.sh back into main configure script, Alex Bennée, 2022/05/27
- [PATCH v1 17/33] tests/tcg: correct target CPU for sparc32, Alex Bennée, 2022/05/27
- [PATCH v1 29/33] gitlab: convert Cirrus jobs to .base_job_template, Alex Bennée, 2022/05/27
- [PATCH v1 15/33] build: do a full build before running TCG tests, Alex Bennée, 2022/05/27
- [PATCH v1 27/33] configure: remove unused variables from config-host.mak, Alex Bennée, 2022/05/27
- [PATCH v1 20/33] configure: handle host compiler in probe_target_compiler, Alex Bennée, 2022/05/27