docker: Don't start a container that doesn't exist
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 <famz@redhat.com> Message-id: 1468934445-32183-10-git-send-email-famz@redhat.com
This commit is contained in:
parent
4b08af6019
commit
ff31e2256d
@ -105,6 +105,9 @@ docker-run-%: docker-qemu-src
|
||||
fi
|
||||
$(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \
|
||||
$(call quiet-command,\
|
||||
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) \
|
||||
@ -117,6 +120,7 @@ docker-run-%: docker-qemu-src
|
||||
qemu:$(IMAGE) \
|
||||
/var/tmp/qemu/run \
|
||||
$(CMD); \
|
||||
fi \
|
||||
, " RUN $(CMD) in $(IMAGE)")))
|
||||
|
||||
docker-clean:
|
||||
|
Loading…
Reference in New Issue
Block a user