From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPUxT-000245-RC for qemu-devel@nongnu.org; Tue, 19 Jul 2016 09:21:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPUxO-0001in-GI for qemu-devel@nongnu.org; Tue, 19 Jul 2016 09:21:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36613) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPUxO-0001ii-Ar for qemu-devel@nongnu.org; Tue, 19 Jul 2016 09:21:06 -0400 From: Fam Zheng Date: Tue, 19 Jul 2016 21:20:44 +0800 Message-Id: <1468934445-32183-10-git-send-email-famz@redhat.com> In-Reply-To: <1468934445-32183-1-git-send-email-famz@redhat.com> References: <1468934445-32183-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v7 09/10] docker: Don't start a container that doesn't exist List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, famz@redhat.com Image building targets are dependencies of test running targets, so when a docker image doesn't exist, it means it's skipped (due to dependency checks in pre script). Therefore, skip the test too. Signed-off-by: Fam Zheng --- tests/docker/Makefile.include | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c5546ee..e7f0023 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -105,7 +105,10 @@ docker-run-%: docker-qemu-src fi $(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \ $(call quiet-command,\ - $(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \ + if $(SRC_PATH)/tests/docker/docker.py images \ + --format={{.Repository}}:{{.Tag}} | \ + grep -qx qemu:$(IMAGE); then \ + $(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \ -t \ $(if $(DEBUG),-i,--net=none) \ -e TARGET_LIST=$(TARGET_LIST) \ @@ -117,6 +120,7 @@ docker-run-%: docker-qemu-src qemu:$(IMAGE) \ /var/tmp/qemu/run \ $(CMD); \ + fi \ , " RUN $(CMD) in $(IMAGE)"))) docker-clean: -- 2.7.4