[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v3 14/15] tests/docker: set HOST_ARCH if we don't have ARCH
From: |
Alex Bennée |
Subject: |
[PULL v3 14/15] tests/docker: set HOST_ARCH if we don't have ARCH |
Date: |
Fri, 25 Oct 2019 20:37:08 +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 v3 02/15] travis.yml: Add libvdeplug-dev to compile-test net/vde.c, (continued)
- [PULL v3 02/15] travis.yml: Add libvdeplug-dev to compile-test net/vde.c, Alex Bennée, 2019/10/25
- [PULL v3 03/15] travis.yml: Use libsdl2 instead of libsdl1.2, and install libsdl2-image, Alex Bennée, 2019/10/25
- [PULL v3 04/15] travis.yml: Use newer version of libgnutls and libpng, Alex Bennée, 2019/10/25
- [PULL v3 01/15] travis.yml: reduce scope of the --enable-debug build, Alex Bennée, 2019/10/25
- [PULL v3 06/15] travis.yml: Test the release tarball, Alex Bennée, 2019/10/25
- [PULL v3 05/15] travis.yml: Fix the ccache lines, Alex Bennée, 2019/10/25
- [PULL v3 08/15] cirrus.yml: add latest Xcode build target, Alex Bennée, 2019/10/25
- [PULL v3 07/15] travis.yml: bump Xcode 10 to latest dot release, Alex Bennée, 2019/10/25
- [PULL v3 09/15] tests/vm: Let subclasses disable IPv6, Alex Bennée, 2019/10/25
- [PULL v3 10/15] tests/vm/netbsd: Disable IPv6, Alex Bennée, 2019/10/25
- [PULL v3 14/15] tests/docker: set HOST_ARCH if we don't have ARCH,
Alex Bennée <=
- [PULL v3 13/15] travis.yml: --enable-debug-tcg to check-tcg, Alex Bennée, 2019/10/25
- [PULL v3 15/15] tests/docker: update Travis image to a more current version, Alex Bennée, 2019/10/25
- [PULL v3 12/15] gitlab-ci.yml: Use libvdeplug-dev to compile-test the VDE network backend, Alex Bennée, 2019/10/25
- [PULL v3 11/15] travis.yml: cache the clang sanitizer build, Alex Bennée, 2019/10/25
- Re: [PULL v3 00/15] testing updates, Peter Maydell, 2019/10/27