[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 20/51] tests/tcg: remove -f from Makefile invocation
From: |
Alex Bennée |
Subject: |
[PATCH v1 20/51] tests/tcg: remove -f from Makefile invocation |
Date: |
Thu, 29 Sep 2022 12:42:00 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Instead of linking tests/tcg/Makefile.target into the build tree, name
the symbolic link "Makefile" and create it in every target subdirectory.
This makes it possible to just invoke "make" in tests/tcg subdirectories.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
configure | 7 ++++---
tests/Makefile.include | 7 +++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 784b77ae90..a48a731bf4 100755
--- a/configure
+++ b/configure
@@ -2282,7 +2282,6 @@ fi
# tests might fail. Prefer to keep the relevant files in their own
# directory and symlink the directory instead.
LINKS="Makefile"
-LINKS="$LINKS tests/tcg/Makefile.target"
LINKS="$LINKS pc-bios/optionrom/Makefile"
LINKS="$LINKS pc-bios/s390-ccw/Makefile"
LINKS="$LINKS pc-bios/vof/Makefile"
@@ -2529,6 +2528,7 @@ fi
echo "# Automatically generated by configure - do not modify" > $makefile
config_host_mak=tests/tcg/config-host.mak
+mkdir -p tests/tcg
echo "# Automatically generated by configure - do not modify" >
$config_host_mak
echo "SRC_PATH=$source_path" >> $config_host_mak
echo "HOST_CC=$host_cc" >> $config_host_mak
@@ -2632,8 +2632,9 @@ for target in $target_list; do
got_cross_cc=yes
fi
if test $got_cross_cc = yes; then
- mkdir -p tests/tcg/$target
- ln -sf ../config-$target.mak tests/tcg/$target/config-target.mak
+ mkdir -p "tests/tcg/$target"
+ ln -sf "$source_path/tests/tcg/Makefile.target"
"tests/tcg/$target/Makefile"
+ ln -sf "../config-$target.mak" "tests/tcg/$target/config-target.mak"
echo "TARGET=$target" >> "$config_target_mak"
echo "QEMU=$PWD/$qemu" >> "$config_target_mak"
echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 826b1895f4..caef287957 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -50,20 +50,19 @@ $(foreach TARGET,$(TCG_TESTS_TARGETS), \
.PHONY: $(TCG_TESTS_TARGETS:%=build-tcg-tests-%)
$(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%:
$(BUILD_DIR)/tests/tcg/config-%.mak
$(call quiet-command, \
- $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS),
\
+ $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS), \
"BUILD","$* guest-tests")
.PHONY: $(TCG_TESTS_TARGETS:%=run-tcg-tests-%)
$(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-%
$(call quiet-command, \
- $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \
- SPEED=$(SPEED) run, \
+ $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) SPEED=$(SPEED) run, \
"RUN", "$* guest-tests")
.PHONY: $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%)
$(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%:
$(call quiet-command, \
- $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS)
clean, \
+ $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) clean, \
"CLEAN", "$* guest-tests")
.PHONY: build-tcg
--
2.34.1
- [PATCH v1 25/51] configure: move tests/tcg/Makefile.prereqs to root build directory, (continued)
- [PATCH v1 25/51] configure: move tests/tcg/Makefile.prereqs to root build directory, Alex Bennée, 2022/09/29
- [PATCH v1 27/51] configure: cleanup creation of tests/tcg target config, Alex Bennée, 2022/09/29
- [PATCH v1 24/51] tests/tcg: move compiler tests to Makefiles, Alex Bennée, 2022/09/29
- [PATCH v1 29/51] pc-bios/optionrom: Adopt meson style Make output, Alex Bennée, 2022/09/29
- [PATCH v1 17/51] configure: return status code from probe_target_compiler, Alex Bennée, 2022/09/29
- [PATCH v1 21/51] tests/tcg: add distclean rule, Alex Bennée, 2022/09/29
- [PATCH v1 49/51] contrib/gitdm: add WANG Xuerui to individual contributers, Alex Bennée, 2022/09/29
- [PATCH v1 23/51] tests/tcg: clean up calls to run-test, Alex Bennée, 2022/09/29
- [PATCH v1 47/51] contrib/gitdm: add mapping for Loongson Technology, Alex Bennée, 2022/09/29
- [PATCH v1 18/51] configure: store container engine in config-host.mak, Alex Bennée, 2022/09/29
- [PATCH v1 20/51] tests/tcg: remove -f from Makefile invocation,
Alex Bennée <=
- [PATCH v1 48/51] contrib/gitdm: add Paul to individual contributors, Alex Bennée, 2022/09/29
- [PATCH v1 50/51] contrib/gitdm: add ISCAS to the academics group, Alex Bennée, 2022/09/29
- [PATCH v1 44/51] gdbstub: move breakpoint logic to accel ops, Alex Bennée, 2022/09/29
- [PATCH v1 33/51] disas: generalise plugin_printf and use for monitor_disas, Alex Bennée, 2022/09/29
- [PATCH v1 42/51] gdbstub: move into its own sub directory, Alex Bennée, 2022/09/29
- [PATCH v1 39/51] contrib/plugins: reset skip when matching in execlog, Alex Bennée, 2022/09/29
- [PATCH v1 35/51] plugins: extend execlog to filter matches, Alex Bennée, 2022/09/29
- [PATCH v1 26/51] configure: unify creation of cross-compilation Makefiles, Alex Bennée, 2022/09/29
- [PATCH v1 22/51] tests/tcg: unify ppc64 and ppc64le Makefiles, Alex Bennée, 2022/09/29
- [PATCH v1 32/51] monitor: expose monitor_puts to rest of code, Alex Bennée, 2022/09/29