mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-25 04:34:23 +00:00
tests: simplify Makefile invocation for tests/tcg
Remove the DOCKER_SCRIPT and TARGET variable from the Makefile invocation for tests/tcg. For DOCKER_SCRIPT, resolve the path to docker.py in configure; for TARGET, move it to config-$(TARGET).mak and use a symbolic link to break the cycle. The symbolic link is still needed because tests/tcg includes dummy config files for targets that are not buildable. Once that is cleaned up, the symbolic link will go away too. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20220929114231.583801-20-alex.bennee@linaro.org>
This commit is contained in:
parent
c4575b5915
commit
a3e28f81fd
23
configure
vendored
23
configure
vendored
|
@ -1784,6 +1784,9 @@ if test $use_containers = "yes"; then
|
||||||
podman) container=podman ;;
|
podman) container=podman ;;
|
||||||
no) container=no ;;
|
no) container=no ;;
|
||||||
esac
|
esac
|
||||||
|
if test "$container" != "no"; then
|
||||||
|
docker_py="$python $source_path/tests/docker/docker.py --engine $container"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# cross compilers defaults, can be overridden with --cross-cc-ARCH
|
# cross compilers defaults, can be overridden with --cross-cc-ARCH
|
||||||
|
@ -2153,16 +2156,16 @@ write_target_makefile() {
|
||||||
write_container_target_makefile() {
|
write_container_target_makefile() {
|
||||||
echo "EXTRA_CFLAGS=$target_cflags"
|
echo "EXTRA_CFLAGS=$target_cflags"
|
||||||
if test -n "$container_cross_cc"; then
|
if test -n "$container_cross_cc"; then
|
||||||
echo "CC=\$(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_SCRIPT) 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
|
fi
|
||||||
echo "AR=\$(DOCKER_SCRIPT) cc --cc $container_cross_ar -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_SCRIPT) cc --cc $container_cross_as -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_SCRIPT) cc --cc $container_cross_ld -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_SCRIPT) cc --cc $container_cross_nm -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_SCRIPT) cc --cc $container_cross_objcopy -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_SCRIPT) cc --cc $container_cross_ranlib -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_SCRIPT) cc --cc $container_cross_strip -i qemu/$container_image -s $source_path --"
|
echo "STRIP=$docker_py cc --cc $container_cross_strip -i qemu/$container_image -s $source_path --"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -2558,6 +2561,8 @@ for target in $target_list; do
|
||||||
fi
|
fi
|
||||||
if test $got_cross_cc = yes; then
|
if test $got_cross_cc = yes; then
|
||||||
mkdir -p tests/tcg/$target
|
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 "QEMU=$PWD/$qemu" >> "$config_target_mak"
|
||||||
echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile
|
echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile
|
||||||
tcg_tests_targets="$tcg_tests_targets $target"
|
tcg_tests_targets="$tcg_tests_targets $target"
|
||||||
|
|
|
@ -50,23 +50,20 @@ $(foreach TARGET,$(TCG_TESTS_TARGETS), \
|
||||||
.PHONY: $(TCG_TESTS_TARGETS:%=build-tcg-tests-%)
|
.PHONY: $(TCG_TESTS_TARGETS:%=build-tcg-tests-%)
|
||||||
$(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/tcg/config-%.mak
|
$(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/tcg/config-%.mak
|
||||||
$(call quiet-command, \
|
$(call quiet-command, \
|
||||||
$(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \
|
$(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS), \
|
||||||
DOCKER_SCRIPT="$(DOCKER_SCRIPT)" \
|
|
||||||
TARGET="$*" SRC_PATH="$(SRC_PATH)", \
|
|
||||||
"BUILD","$* guest-tests")
|
"BUILD","$* guest-tests")
|
||||||
|
|
||||||
.PHONY: $(TCG_TESTS_TARGETS:%=run-tcg-tests-%)
|
.PHONY: $(TCG_TESTS_TARGETS:%=run-tcg-tests-%)
|
||||||
$(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-%
|
$(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-%
|
||||||
$(call quiet-command, \
|
$(call quiet-command, \
|
||||||
$(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \
|
$(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \
|
||||||
TARGET="$*" SRC_PATH="$(SRC_PATH)" SPEED=$(SPEED) run, \
|
SPEED=$(SPEED) run, \
|
||||||
"RUN", "$* guest-tests")
|
"RUN", "$* guest-tests")
|
||||||
|
|
||||||
.PHONY: $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%)
|
.PHONY: $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%)
|
||||||
$(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%:
|
$(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%:
|
||||||
$(call quiet-command, \
|
$(call quiet-command, \
|
||||||
$(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \
|
$(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) clean, \
|
||||||
TARGET="$*" SRC_PATH="$(SRC_PATH)" clean, \
|
|
||||||
"CLEAN", "$* guest-tests")
|
"CLEAN", "$* guest-tests")
|
||||||
|
|
||||||
.PHONY: build-tcg
|
.PHONY: build-tcg
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
all:
|
all:
|
||||||
-include ../config-host.mak
|
-include ../config-host.mak
|
||||||
-include ../config-$(TARGET).mak
|
-include config-target.mak
|
||||||
|
|
||||||
# Get semihosting definitions for user-mode emulation
|
# Get semihosting definitions for user-mode emulation
|
||||||
ifeq ($(filter %-softmmu, $(TARGET)),)
|
ifeq ($(filter %-softmmu, $(TARGET)),)
|
||||||
|
|
Loading…
Reference in a new issue