[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/7] tests: simplify Makefile invocation for tests/tcg
From: |
Paolo Bonzini |
Subject: |
[PATCH 6/7] tests: simplify Makefile invocation for tests/tcg |
Date: |
Tue, 7 Jun 2022 11:40:30 +0200 |
The tests/tcg Makefile invocation contains the paths to DOCKER_SCRIPT
and TARGET.
One can just resolve the path to docker.py in configure so that submakes
do not need the DOCKER_SCRIPT variable. In order to remove the TARGET
variable, create a config-target.mak file in tests/tcg/$TARGET. For now
config-$target.mak is created before the check for compiler presence,
while tests/tcg/$TARGET is created afterwards. This is temporary.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 23 ++++++++++++++---------
tests/Makefile.include | 9 +++------
tests/tcg/Makefile.target | 2 +-
3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/configure b/configure
index 0fd5a3cfad..9d49ea4c5b 100755
--- a/configure
+++ b/configure
@@ -1824,6 +1824,9 @@ if test $use_containers = "yes"; then
podman) container=podman ;;
no) container=no ;;
esac
+ if test "$container" != "no"; then
+ docker_py="$python $source_path/tests/docker/docker.py --engine
$container"
+ fi
fi
# cross compilers defaults, can be overridden with --cross-cc-ARCH
@@ -2130,16 +2133,16 @@ write_target_makefile() {
write_container_target_makefile() {
echo "$1: docker-image-$container_image" >> Makefile.prereqs
if test -n "$container_cross_cc"; then
- echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i
qemu/$container_image -s $source_path --"
- echo "CCAS=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i
qemu/$container_image -s $source_path --"
+ echo "CC=$docker_py cc --cc $container_cross_cc -i qemu/$container_image
-s $source_path --"
+ echo "CCAS=$docker_py cc --cc $container_cross_cc -i qemu/$container_image
-s $source_path --"
fi
- echo "AR=\$(DOCKER_SCRIPT) cc --cc $container_cross_ar -i
qemu/$container_image -s $source_path --"
- echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i
qemu/$container_image -s $source_path --"
- echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i
qemu/$container_image -s $source_path --"
- echo "NM=\$(DOCKER_SCRIPT) cc --cc $container_cross_nm -i
qemu/$container_image -s $source_path --"
- echo "OBJCOPY=\$(DOCKER_SCRIPT) cc --cc $container_cross_objcopy -i
qemu/$container_image -s $source_path --"
- echo "RANLIB=\$(DOCKER_SCRIPT) cc --cc $container_cross_ranlib -i
qemu/$container_image -s $source_path --"
- echo "STRIP=\$(DOCKER_SCRIPT) cc --cc $container_cross_strip -i
qemu/$container_image -s $source_path --"
+ echo "AR=$docker_py cc --cc $container_cross_ar -i qemu/$container_image -s
$source_path --"
+ echo "AS=$docker_py cc --cc $container_cross_as -i qemu/$container_image -s
$source_path --"
+ echo "LD=$docker_py cc --cc $container_cross_ld -i qemu/$container_image -s
$source_path --"
+ echo "NM=$docker_py cc --cc $container_cross_nm -i qemu/$container_image -s
$source_path --"
+ echo "OBJCOPY=$docker_py cc --cc $container_cross_objcopy -i
qemu/$container_image -s $source_path --"
+ echo "RANLIB=$docker_py cc --cc $container_cross_ranlib -i
qemu/$container_image -s $source_path --"
+ echo "STRIP=$docker_py cc --cc $container_cross_strip -i
qemu/$container_image -s $source_path --"
}
@@ -2597,6 +2600,8 @@ for target in $target_list; do
fi
if test $got_cross_cc = yes; then
mkdir -p tests/tcg/$target
+ 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 "EXTRA_CFLAGS=$target_cflags" >> $config_target_mak
echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs
diff --git a/tests/Makefile.include b/tests/Makefile.include
index f4ba4027ea..f2182ead1e 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -47,23 +47,20 @@ $(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) \
- DOCKER_SCRIPT="$(DOCKER_SCRIPT)" \
- TARGET="$*" SRC_PATH="$(SRC_PATH)", \
+ $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(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) \
- TARGET="$*" SRC_PATH="$(SRC_PATH)" SPEED=$(SPEED) run,
\
+ 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) \
- TARGET="$*" SRC_PATH="$(SRC_PATH)" clean, \
+ $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS)
clean, \
"CLEAN", "$* guest-tests")
.PHONY: build-tcg
diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index f427a0304e..1e1c7097c6 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -31,7 +31,7 @@
all:
-include ../config-host.mak
--include ../config-$(TARGET).mak
+-include config-target.mak
# Get semihosting definitions for user-mode emulation
ifeq ($(filter %-softmmu, $(TARGET)),)
--
2.36.1
- [PATCH 0/7] More tests/tcg cleanups, Paolo Bonzini, 2022/06/07
- [PATCH 3/7] configure: allow more host/target combos to use the host compiler, Paolo Bonzini, 2022/06/07
- [PATCH 4/7] configure: move tests/tcg/Makefile.prereqs to root build directory, Paolo Bonzini, 2022/06/07
- [PATCH 6/7] tests: simplify Makefile invocation for tests/tcg,
Paolo Bonzini <=
- [PATCH 5/7] configure: store container engine in config-host.mak, Paolo Bonzini, 2022/06/07
- [PATCH 2/7] build: include pc-bios/ part in the ROMS variable, Paolo Bonzini, 2022/06/07
- [PATCH 1/7] meson: put cross compiler info in a separate section, Paolo Bonzini, 2022/06/07
- [PATCH 7/7] tests/tcg: remove -f from Makefile invocation, Paolo Bonzini, 2022/06/07
- Re: [PATCH 0/7] More tests/tcg cleanups, Paolo Bonzini, 2022/06/07