[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/45] tests/docker: move DEF_TARGET_LIST setting to
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 11/45] tests/docker: move DEF_TARGET_LIST setting to common.rc |
Date: |
Tue, 10 Sep 2019 09:43:15 +0100 |
We might as well not repeat ourselves. At the same time allow it to be
overridden which we will use later from docker targets.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/tests/docker/common.rc b/tests/docker/common.rc
index 4011561587a..512202b0a19 100755
--- a/tests/docker/common.rc
+++ b/tests/docker/common.rc
@@ -11,6 +11,10 @@
# or (at your option) any later version. See the COPYING file in
# the top-level directory.
+# This might be set by ENV of a docker container... it is always
+# overriden by TARGET_LIST if the user sets it.
+DEF_TARGET_LIST=${DEF_TARGET_LIST:-"x86_64-softmmu,aarch64-softmmu"}
+
requires()
{
for c in $@; do
diff --git a/tests/docker/test-build b/tests/docker/test-build
index 22766cfacc0..2b2a7832f15 100755
--- a/tests/docker/test-build
+++ b/tests/docker/test-build
@@ -15,7 +15,6 @@
cd "$BUILD_DIR"
-DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu"
TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
build_qemu
install_qemu
diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw
index fdb1c2c879d..c30eb654eb7 100755
--- a/tests/docker/test-mingw
+++ b/tests/docker/test-mingw
@@ -16,7 +16,6 @@
requires mingw dtc
cd "$BUILD_DIR"
-DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu"
for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
diff --git a/tests/docker/test-quick b/tests/docker/test-quick
index eee59c55fba..feee44b2476 100755
--- a/tests/docker/test-quick
+++ b/tests/docker/test-quick
@@ -15,7 +15,6 @@
cd "$BUILD_DIR"
-DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu"
TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
build_qemu
check_qemu
--
2.20.1
- Re: [Qemu-devel] [PULL 44/45] Fedora images: use URLs from stable "archives.fedoraproject.org", (continued)
- [Qemu-devel] [PULL 26/45] tests/docker: add debian-xtensa-cross to DEBIAN_PARTIAL_IMAGES, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 30/45] tests/docker: use --arch-only for installing deps, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 27/45] tests/docker: add debian9-mxe to DEBIAN_PARTIAL_IMAGES, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 37/45] .travis.yml: Cache Avocado cache, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 34/45] .travis.yml: Enable multiple caching features, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 23/45] tests/docker: move our ppc64 cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 12/45] tests/docker: set DEF_TARGET_LIST for some containers, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 45/45] travis.yml: Install libcap-dev for testing virito-9p, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 33/45] configure: check if --no-pie is supported first, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 11/45] tests/docker: move DEF_TARGET_LIST setting to common.rc,
Alex Bennée <=
- [Qemu-devel] [PULL 29/45] tests/docker: add debian-amd64-cross for non-x86 hosts, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 24/45] tests/docker: update Debian Sid image, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 36/45] .travis.yml: Cache Python PIP packages, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 25/45] tests/docker: pin powerpc-user-cross to a snapshot, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 35/45] .travis.yml: Increase cache timeout from 3min to 20min, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 39/45] .travis.yml: Enable ccache on OSX, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 17/45] tests/docker: move our HPPA cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 43/45] .travis.yml: Cache Linux/Clang jobs together, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 40/45] .travis.yml: Document how the build matrix use caches, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 31/45] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64, Alex Bennée, 2019/09/10