From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btzjR-0001dY-Pj for qemu-devel@nongnu.org; Tue, 11 Oct 2016 12:16:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1btzjP-0001xL-O3 for qemu-devel@nongnu.org; Tue, 11 Oct 2016 12:16:44 -0400 Received: from mail-qk0-x233.google.com ([2607:f8b0:400d:c09::233]:33982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btzjP-0001xD-Jx for qemu-devel@nongnu.org; Tue, 11 Oct 2016 12:16:43 -0400 Received: by mail-qk0-x233.google.com with SMTP id f128so39895278qkb.1 for ; Tue, 11 Oct 2016 09:16:43 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Tue, 11 Oct 2016 17:16:25 +0100 Message-Id: <20161011161625.9070-6-alex.bennee@linaro.org> In-Reply-To: <20161011161625.9070-1-alex.bennee@linaro.org> References: <20161011161625.9070-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v3 5/5] tests/docker/Makefile.include: remove verification targets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: famz@redhat.com Cc: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= As it turns out there are a bunch of verification targets we don't hit because of other matching patterns in rules.mk. Drop the verification steps all together. Signed-off-by: Alex Bennée --- v3 - new for v3, could be squashed with previous commit --- tests/docker/Makefile.include | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ba7c984..925f711 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -134,40 +134,12 @@ docker-run: docker-qemu-src /var/tmp/qemu/run \ $(TEST), " RUN $(TEST) in ${IMAGE}") +# Run targets: # -# Verification targets -# -# These targets help verify the test (CMD) and docker tag (IMAGE) are -# part of the built in set of tests and images. You can still call the -# docker-run target directly for testsing against arbitary images. -# - -docker-verify-image-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-verify-image-\([^@]*\)@\(.*\)/\2/') -docker-verify-image-%: - @if test -z "$(IMAGE)"; \ - then echo "Invalid image"; exit 1; \ - fi - $(if $(filter $(IMAGE), $(DOCKER_IMAGES)), , \ - echo "$(IMAGE) is not a known image"; exit 1) \ - -docker-verify-test-%: CMD = $(shell echo '$@' | sed -e 's/docker-verify-test-\([^@]*\)@\(.*\)/\1/') -docker-verify-test-%: - @if test -z "$(CMD)"; \ - then echo "Invalid test"; exit 1; \ - fi - $(if $(filter $(CMD), $(DOCKER_TESTS)), , \ - echo "$(CMD) is not a known test"; exit 1) - -# Run targets -# -# This will take a target such as docker-test-foo@bar and verify that: -# - the test test-foo is a known test -# - the image bar is a known image -# -# It will then call the docker-run +# Of the form docker-TEST-FOO@IMAGE-BAR which will then be expanded into a call to "make docker-run" docker-run-%: CMD = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\1/') docker-run-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\2/') -docker-run-%: docker-verify-image-% docker-verify-test-% +docker-run-%: @make docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE) docker-clean: -- 2.9.3