[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 18/51] configure: store container engine in config-host.mak
From: |
Alex Bennée |
Subject: |
[PATCH v1 18/51] configure: store container engine in config-host.mak |
Date: |
Thu, 29 Sep 2022 12:41:58 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
In preparation for removing $(DOCKER_SCRIPT) from the tests/tcg configuration
files, have Make use the same container engine that had been probed at
configure time.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
configure | 11 ++++++++---
tests/docker/Makefile.include | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index f3984bb193..ad70c81bfe 100755
--- a/configure
+++ b/configure
@@ -1810,9 +1810,11 @@ fi
container="no"
if test $use_containers = "yes"; then
- if has "docker" || has "podman"; then
- container=$($python "$source_path"/tests/docker/docker.py probe)
- fi
+ case $($python "$source_path"/tests/docker/docker.py probe) in
+ *docker) container=docker ;;
+ podman) container=podman ;;
+ no) container=no ;;
+ esac
fi
# cross compilers defaults, can be overridden with --cross-cc-ARCH
@@ -2444,6 +2446,9 @@ if test -n "$gdb_bin"; then
fi
fi
+if test "$container" != no; then
+ echo "ENGINE=$container" >> $config_host_mak
+fi
echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
echo "PYTHON=$python" >> $config_host_mak
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 270e99786e..c87f14477a 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -14,7 +14,7 @@ DOCKER_DEFAULT_REGISTRY :=
registry.gitlab.com/qemu-project/qemu
endif
DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY))
-ENGINE := auto
+ENGINE ?= auto
DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE)
CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)
--
2.34.1
- [PATCH v1 43/51] gdbstub: move sstep flags probing into AccelClass, (continued)
- [PATCH v1 43/51] gdbstub: move sstep flags probing into AccelClass, Alex Bennée, 2022/09/29
- [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 <=
- [PATCH v1 20/51] tests/tcg: remove -f from Makefile invocation, Alex Bennée, 2022/09/29
- [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