[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 15/73] tests/docker: set HOST_ARCH if we don't have ARCH
From: |
Alex Bennée |
Subject: |
[PULL v2 15/73] tests/docker: set HOST_ARCH if we don't have ARCH |
Date: |
Fri, 25 Oct 2019 07:36:15 +0100 |
As the docker rules want to be able to be run on a virgin unconfigured
checkout add a fallback and use it if we need to.
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/.shippable.yml b/.shippable.yml
index bbc6f88510f..f74a3de3ffd 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -27,8 +27,6 @@ env:
TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user
build:
pre_ci:
- # usually host ARCH is set by configure
- - echo "ARCH=$(uname -m)" > config-host.mak
- make docker-image-${IMAGE} V=1
pre_ci_boot:
image_name: qemu
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 89c56a3a88c..19dbe261699 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -2,6 +2,8 @@
.PHONY: docker docker-test docker-clean docker-image docker-qemu-src
+HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
+
DOCKER_SUFFIX := .docker
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
# we don't run tests on intermediate images (used as base by another image)
@@ -88,7 +90,7 @@ endif
# Enforce dependencies for composite images
docker-image-debian9-mxe: docker-image-debian9
-ifeq ($(ARCH),x86_64)
+ifeq ($(HOST_ARCH),x86_64)
docker-image-debian-amd64: docker-image-debian9
DOCKER_PARTIAL_IMAGES += debian-amd64-cross
else
@@ -106,7 +108,7 @@ docker-image-debian-win32-cross: docker-image-debian9-mxe
docker-image-debian-win64-cross: docker-image-debian9-mxe
# For non-x86 hosts not all cross-compilers have been packaged
-ifneq ($(ARCH),x86_64)
+ifneq ($(HOST_ARCH),x86_64)
DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross
debian-mips64el-cross
DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross
DOCKER_PARTIAL_IMAGES += debian-s390x-cross
--
2.20.1
- [PULL v2 20/73] translate-all: use cpu_in_exclusive_work_context() in tb_flush, (continued)
- [PULL v2 20/73] translate-all: use cpu_in_exclusive_work_context() in tb_flush, Alex Bennée, 2019/10/25
- [PULL v2 30/73] atomic_template: add inline trace/plugin helpers, Alex Bennée, 2019/10/25
- [PULL v2 62/73] tests/tcg: move "virtual" tests to EXTRA_TESTS, Alex Bennée, 2019/10/25
- [PULL v2 49/73] target/xtensa: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 60/73] tests/tcg/Makefile.target: fix path to config-host.mak, Alex Bennée, 2019/10/25
- [PULL v2 50/73] target/openrisc: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 57/73] vl: support -plugin option, Alex Bennée, 2019/10/25
- [PULL v2 69/73] include/exec: wrap cpu_ldst.h in CONFIG_TCG, Alex Bennée, 2019/10/25
- [PULL v2 17/73] trace: expand mem_info:size_shift to 4 bits, Alex Bennée, 2019/10/25
- [PULL v2 25/73] queue: add QTAILQ_REMOVE_SEVERAL, Alex Bennée, 2019/10/25
- [PULL v2 15/73] tests/docker: set HOST_ARCH if we don't have ARCH,
Alex Bennée <=
- [PULL v2 46/73] target/alpha: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 35/73] *-user: plugin syscalls, Alex Bennée, 2019/10/25
- [PULL v2 67/73] tests/plugin: add hotpages to analyse memory access patterns, Alex Bennée, 2019/10/25
- [PULL v2 34/73] *-user: notify plugin of exit, Alex Bennée, 2019/10/25
- [PULL v2 45/73] target/m68k: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 48/73] target/sparc: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 32/73] plugins: implement helpers for resolving hwaddr, Alex Bennée, 2019/10/25
- [PULL v2 41/73] target/ppc: fetch code with translator_ld, Alex Bennée, 2019/10/25
- [PULL v2 37/73] plugin-gen: add plugin_insn_append, Alex Bennée, 2019/10/25