[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/7] tests/docker: fix the IMAGE for build invocation
From: |
Alex Bennée |
Subject: |
[PULL 4/7] tests/docker: fix the IMAGE for build invocation |
Date: |
Tue, 14 Jun 2022 01:42:06 +0100 |
We inadvertently broke the ability to run local builds when the code
was re-factored. The result was the run stanza failing to find the
docker image with it's qemu/ prefix.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Fixes: d39eaa2266 ("tests/docker: simplify docker-TEST@IMAGE targets")
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220613171258.1905715-5-alex.bennee@linaro.org>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index e68f91b853..ef4518d9eb 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -171,7 +171,7 @@ DOCKER_TESTS := $(if $(TESTS), $(filter $(TESTS),
$(__TESTS)), $(__TESTS))
$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
$(foreach t,$(DOCKER_TESTS), \
$(eval .PHONY: docker-$t@$i) \
- $(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run
TEST=$t IMAGE=$i) \
+ $(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run
TEST=$t IMAGE=qemu/$i) \
) \
$(foreach t,$(DOCKER_TESTS), \
$(eval docker-all-tests: docker-$t@$i) \
--
2.30.2
- [PULL 0/7] testing/next (docker, gitlab,tcg), Alex Bennée, 2022/06/13
- [PULL 3/7] gitlab-ci: Fix the build-cfi-aarch64 and build-cfi-ppc64-s390x jobs, Alex Bennée, 2022/06/13
- [PULL 1/7] test/tcg/arm: Use -mfloat-abi=soft for test-armv6m-undef, Alex Bennée, 2022/06/13
- [PULL 5/7] tests/tcg: disable xtensa-linux-user again, Alex Bennée, 2022/06/13
- [PULL 6/7] gitlab: compare CIRRUS_nn vars against 'null' not "", Alex Bennée, 2022/06/13
- [PULL 2/7] tests/tcg/i386: Use explicit suffix on fist insns, Alex Bennée, 2022/06/13
- [PULL 4/7] tests/docker: fix the IMAGE for build invocation,
Alex Bennée <=
- [PULL 7/7] .gitlab: use less aggressive nproc on our aarch64/32 runners, Alex Bennée, 2022/06/13
- Re: [PULL 0/7] testing/next (docker, gitlab,tcg), Richard Henderson, 2022/06/14