[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 01/16] configure: allow disable of cross compilation container
From: |
Alex Bennée |
Subject: |
[PATCH v1 01/16] configure: allow disable of cross compilation containers |
Date: |
Mon, 16 Dec 2019 11:07:17 +0000 |
Our docker infrastructure isn't quite as multiarch as we would wish so
lets allow the user to disable it if they want. This will allow us to
use still run check-tcg on non-x86 CI setups.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
---
configure | 8 +++++++-
tests/tcg/configure.sh | 6 ++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 2c72e04d23f..419e1554978 100755
--- a/configure
+++ b/configure
@@ -302,6 +302,7 @@ audio_win_int=""
libs_qga=""
debug_info="yes"
stack_protector=""
+use_containers="yes"
if test -e "$source_path/.git"
then
@@ -1539,6 +1540,10 @@ for opt do
;;
--disable-plugins) plugins="no"
;;
+ --enable-containers) use_containers="yes"
+ ;;
+ --disable-containers) use_containers="no"
+ ;;
*)
echo "ERROR: unknown option $opt"
echo "Try '$0 --help' for more information"
@@ -1722,6 +1727,7 @@ Advanced options (experts only):
track the maximum stack usage of stacks created by
qemu_alloc_stack
--enable-plugins
enable plugins via shared library loading
+ --disable-containers don't use containers for cross-building
Optional features, enabled with --enable-FEATURE and
disabled with --disable-FEATURE, default is enabled if available:
@@ -8023,7 +8029,7 @@ done
(for i in $cross_cc_vars; do
export $i
done
-export target_list source_path
+export target_list source_path use_containers
$source_path/tests/tcg/configure.sh)
# temporary config to build submodules
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 6c4a471aeae..210e68396f2 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -36,8 +36,10 @@ TMPC="${TMPDIR1}/qemu-conf.c"
TMPE="${TMPDIR1}/qemu-conf.exe"
container="no"
-if has "docker" || has "podman"; then
- container=$($python $source_path/tests/docker/docker.py probe)
+if test $use_containers = "yes"; then
+ if has "docker" || has "podman"; then
+ container=$($python $source_path/tests/docker/docker.py probe)
+ fi
fi
# cross compilers defaults, can be overridden with --cross-cc-ARCH
--
2.20.1
- [PATCH v1 00/16] testing and logging changes for master, Alex Bennée, 2019/12/16
- [PATCH v1 01/16] configure: allow disable of cross compilation containers,
Alex Bennée <=
- [PATCH v1 02/16] tests/vm: Allow to set qemu-img path, Alex Bennée, 2019/12/16
- [PATCH v1 03/16] travis.yml: Run tcg tests with tci, Alex Bennée, 2019/12/16
- [PATCH v1 04/16] iotests: Provide a function for checking the creation of huge files, Alex Bennée, 2019/12/16
- [PATCH v1 05/16] iotests: Skip test 060 if it is not possible to create large files, Alex Bennée, 2019/12/16
- [PATCH v1 06/16] iotests: Skip test 079 if it is not possible to create large files, Alex Bennée, 2019/12/16
- [PATCH v1 07/16] tests/hd-geo-test: Skip test when images can not be created, Alex Bennée, 2019/12/16