[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 08/42] tests/docker: move DEF_TARGET_LIST setting
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v1 08/42] tests/docker: move DEF_TARGET_LIST setting to common.rc |
Date: |
Wed, 4 Sep 2019 21:29:39 +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>
---
tests/docker/common.rc | 4 ++++
tests/docker/test-build | 1 -
tests/docker/test-mingw | 1 -
tests/docker/test-quick | 1 -
4 files changed, 4 insertions(+), 3 deletions(-)
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] [PATCH v1 06/42] tests/tcg: move configuration to a sub-shell script, (continued)
- [Qemu-devel] [PATCH v1 10/42] tests/docker: add Buster to DOCKER_PARTIAL_IMAGES, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 04/42] tests/tcg: use EXTRA_CFLAGS everywhere, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 30/42] .travis.yml: Enable multiple caching features, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 05/42] tests/tcg: cleanup Makefile inclusions, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 14/42] tests/docker: move our HPPA cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 07/42] tests/tcg: add .gitignore for in source builds, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 29/42] configure: check if --no-pie is supported first, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 08/42] tests/docker: move DEF_TARGET_LIST setting to common.rc,
Alex Bennée <=
- [Qemu-devel] [PATCH v1 11/42] tests/docker: move our arm64 cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 15/42] tests/docker: move our m68k cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 09/42] tests/docker: set DEF_TARGET_LIST for some containers, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 13/42] tests/docker: move our Alpha cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 19/42] tests/docker: move our riscv64 cross compile to Buster, Alex Bennée, 2019/09/04