Kaynağa Gözat

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>
Alex Bennée 6 yıl önce
ebeveyn
işleme
6945018a68

+ 4 - 0
tests/docker/common.rc

@@ -11,6 +11,10 @@
 # or (at your option) any later version. See the COPYING file in
 # or (at your option) any later version. See the COPYING file in
 # the top-level directory.
 # 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()
 requires()
 {
 {
     for c in $@; do
     for c in $@; do

+ 0 - 1
tests/docker/test-build

@@ -15,7 +15,6 @@
 
 
 cd "$BUILD_DIR"
 cd "$BUILD_DIR"
 
 
-DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu"
 TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
 TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
 build_qemu
 build_qemu
 install_qemu
 install_qemu

+ 0 - 1
tests/docker/test-mingw

@@ -16,7 +16,6 @@
 requires mingw dtc
 requires mingw dtc
 
 
 cd "$BUILD_DIR"
 cd "$BUILD_DIR"
-DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu"
 
 
 for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
 for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do
     TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
     TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \

+ 0 - 1
tests/docker/test-quick

@@ -15,7 +15,6 @@
 
 
 cd "$BUILD_DIR"
 cd "$BUILD_DIR"
 
 
-DEF_TARGET_LIST="x86_64-softmmu,aarch64-softmmu"
 TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
 TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \
 build_qemu
 build_qemu
 check_qemu
 check_qemu