tests/docker: move DEF_TARGET_LIST setting to common.rc

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 <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

diff --git a/tests/docker/common.rc b/tests/docker/common.rc
index 4011561587a5794021187d4792360d17bfb7784c..512202b0a19e93a8468c2614d8deee15ada7939e 100755 (executable)
--- 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 22766cfacc08ec51d8ca1cc3a15924d8fbe174a4..2b2a7832f15e5f4cd9fc60b459b9f22e01ac6be1 100755 (executable)
--- 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 fdb1c2c879df8cf2e250031e64b76caa99115c29..c30eb654eb7940f512bf848b208ecc20ff7e5b29 100755 (executable)
--- 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 eee59c55fba0951f761444e194ff6cd00f11eee9..feee44b2476768f8b6ce790ebc850cc5a5d2d4b8 100755 (executable)
--- 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