[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 5/8] docker: Restrict the 'travis' job to the Tr
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [RFC PATCH 5/8] docker: Restrict the 'travis' job to the Travis image |
Date: |
Thu, 28 Jun 2018 13:46:40 -0300 |
We can still run any test in Travis.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/docker/Makefile.include | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 91d9665517..7d9d568eee 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -99,11 +99,17 @@ docker-image-tricore-cross: docker-image-debian9
# Expand all the pre-requistes for each docker image and test combination
$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \
- $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
+ $(foreach t,$(DOCKER_TESTS), \
$(eval .PHONY: address@hidden) \
$(eval address@hidden: docker-image-$i address@hidden) \
+ $(eval docker-test: address@hidden) \
) \
- $(foreach t,$(DOCKER_TESTS), \
+)
+# we only run Travis tests on the Travis image
+$(foreach i,travis, \
+ $(foreach t,$(DOCKER_TOOLS), \
+ $(eval .PHONY: address@hidden) \
+ $(eval address@hidden: docker-image-$i address@hidden) \
$(eval docker-test: address@hidden) \
) \
)
--
2.18.0
- [Qemu-devel] [PATCH 0/8] Docker improvements, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [PATCH 1/8] docker: ubuntu: Update the package list before installing new ones, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [PATCH 2/8] docker: ubuntu: Use SDL2, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [PATCH 3/8] docker: Clean the MXE base image, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [RFC PATCH 4/8] docker: Add packages required to build a Linux kernel, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [RFC PATCH 5/8] docker: Restrict the 'travis' job to the Travis image,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 6/8] docker: Do not run tests in 'intermediate' images, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [PATCH 8/8] .shippable.yml: Restore the powerpc-cross image, Philippe Mathieu-Daudé, 2018/06/28
- [Qemu-devel] [PATCH 7/8] docker: Cross build QEMU on ppc32 hosts, Philippe Mathieu-Daudé, 2018/06/28
- Re: [Qemu-devel] [PATCH 0/8] Docker improvements, Alex Bennée, 2018/06/29