[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 6/7] configure: allow disable of cross compilation containers
From: |
Thomas Huth |
Subject: |
[PATCH v2 6/7] configure: allow disable of cross compilation containers |
Date: |
Wed, 4 Dec 2019 16:46:17 +0100 |
From: Alex Bennée <address@hidden>
Our docker infrastructure isn't quite as multiarch as we would wish so
let's 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>
Signed-off-by: Thomas Huth <address@hidden>
---
configure | 8 +++++++-
tests/tcg/configure.sh | 6 ++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 6099be1d84..fe6d0971f1 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:
@@ -8039,7 +8045,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 6c4a471aea..210e68396f 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.18.1
- [PATCH v2 0/7] Enable Travis builds on arm64, ppc64le and s390x, Thomas Huth, 2019/12/04
- [PATCH v2 1/7] iotests: Provide a function for checking the creation of huge files, Thomas Huth, 2019/12/04
- [PATCH v2 2/7] iotests: Skip test 060 if it is not possible to create large files, Thomas Huth, 2019/12/04
- [PATCH v2 6/7] configure: allow disable of cross compilation containers,
Thomas Huth <=
- [PATCH v2 3/7] iotests: Skip test 079 if it is not possible to create large files, Thomas Huth, 2019/12/04
- [PATCH v2 7/7] travis.yml: Enable builds on arm64, ppc64le and s390x, Thomas Huth, 2019/12/04
- [PATCH v2 4/7] tests/hd-geo-test: Skip test when images can not be created, Thomas Huth, 2019/12/04
- [PATCH v2 5/7] tests/test-util-filemonitor: Skip test on non-x86 Travis containers, Thomas Huth, 2019/12/04