[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/20] configure: store container engine in config-host.mak
From: |
Paolo Bonzini |
Subject: |
[PATCH 07/20] configure: store container engine in config-host.mak |
Date: |
Fri, 26 Aug 2022 00:27:32 +0200 |
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>
---
configure | 11 ++++++++---
tests/docker/Makefile.include | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 6f15f3c687..ed18a17013 100755
--- a/configure
+++ b/configure
@@ -1843,9 +1843,11 @@ esac
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
@@ -2476,6 +2478,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 9a45e8890b..c5cfdda04d 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.37.1
- [PATCH 00/20] Cross compilation changes for 7.2, Paolo Bonzini, 2022/08/25
- [PATCH 01/20] configure: do not invoke as/ld directly for pc-bios/optionrom, Paolo Bonzini, 2022/08/25
- [PATCH 03/20] pc-bios/s390-ccw: detect CC options just once, Paolo Bonzini, 2022/08/25
- [PATCH 05/20] build: add recursive distclean rules, Paolo Bonzini, 2022/08/25
- [PATCH 02/20] pc-bios/optionrom: detect CC options just once, Paolo Bonzini, 2022/08/25
- [PATCH 06/20] configure: return status code from probe_target_compiler, Paolo Bonzini, 2022/08/25
- [PATCH 04/20] vof: add distclean target, Paolo Bonzini, 2022/08/25
- [PATCH 07/20] configure: store container engine in config-host.mak,
Paolo Bonzini <=
- [PATCH 08/20] tests: simplify Makefile invocation for tests/tcg, Paolo Bonzini, 2022/08/25
- [PATCH 09/20] tests/tcg: remove -f from Makefile invocation, Paolo Bonzini, 2022/08/25
- [PATCH 10/20] tests/tcg: add distclean rule, Paolo Bonzini, 2022/08/25
- [PATCH 11/20] tests/tcg: unify ppc64 and ppc64le Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 12/20] tests/tcg: clean up calls to run-test, Paolo Bonzini, 2022/08/25
- [PATCH 13/20] tests/tcg: move compiler tests to Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 14/20] configure: move tests/tcg/Makefile.prereqs to root build directory, Paolo Bonzini, 2022/08/25
- [PATCH 15/20] configure: unify creation of cross-compilation Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 17/20] configure: build ROMs with container-based cross compilers, Paolo Bonzini, 2022/08/25
- [PATCH 18/20] pc-bios/optionrom: Adopt meson style Make output, Paolo Bonzini, 2022/08/25