Skip to content
Snippets Groups Projects
Commit c4575b59 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Alex Bennée
Browse files

configure: store container engine in config-host.mak


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: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-Id: <20220929114231.583801-19-alex.bennee@linaro.org>
parent 61cbb356
Branches
No related tags found
No related merge requests found
......@@ -1779,9 +1779,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
......@@ -2373,6 +2375,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
......
......@@ -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.$$$$)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment