On 8/9/19 5:50 PM, Alex Bennée wrote:
> 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.ben...@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> 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
>
