From patchwork Tue Oct 11 16:16:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 77495 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp75353qge; Tue, 11 Oct 2016 09:19:00 -0700 (PDT) X-Received: by 10.200.42.122 with SMTP id l55mr4102349qtl.157.1476202740799; Tue, 11 Oct 2016 09:19:00 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d10si1781493qkc.278.2016.10.11.09.19.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 11 Oct 2016 09:19:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btzlc-0002Xx-Cd for patch@linaro.org; Tue, 11 Oct 2016 12:19:00 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bq1csoZUrnkYsPJlbEC9iBFvC3J3zT/evlwvee1qSms=; b=Ungy6Xjib795iOSU6XcweWPZtOeOVNVy9UDmHffS8z+bufcCcIqb3V2+qV1/eaDTd3 UPAeucOGXE/vm/ZUGNPLTSEtp2XECbr9yeG3o1dlshXOdK7VGDihH0h5WCdnSXDy3gkc ay5q48OJSKlrBzRYTlqjmDpN9OxWPSpNPy9XA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bq1csoZUrnkYsPJlbEC9iBFvC3J3zT/evlwvee1qSms=; b=OOc6a7wSynd/kkvTZooP9O88W+hYwLMvIztOhETH0SalPnrHTYnWyptV8yhrrUH3K9 B22KvA3GgSqk03mgzs10bCxayTERzOA8RVeU9K3jBsjgpr/Bt24R4BI34dibVNpzpfuO qrfF+6Y3NggW930pzGxU7ThmcjYFZGp9ibWYUYuht/CfdUGWEbani+BFJ16CJVNa6ERK /uex6aTxoq3V1YtbEniW+ktZmJ7Awy5Y7SREam8QnddK0dLv0q8Gm128bUw2Sn4u74Xq Y/mnqyw1QMB2gRsMMCI1wlzUDYOl/VBABy+PNIQzFOqOMBNt6j0j275AfQ070935Yzse OGEw== X-Gm-Message-State: AA6/9Rntz53wGSihGqo1Ok4Z3WikBzIlwOPgvAXJNXkm0+bYrtYalN/MSDLFDlq0jzUzQ7ZJ X-Received: by 10.194.87.42 with SMTP id u10mr5962934wjz.213.1476202600997; Tue, 11 Oct 2016 09:16:40 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 17sm7514416wju.44.2016.10.11.09.16.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Oct 2016 09:16:40 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 977EF3E0563; Tue, 11 Oct 2016 17:16:36 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: famz@redhat.com Date: Tue, 11 Oct 2016 17:16:25 +0100 Message-Id: <20161011161625.9070-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161011161625.9070-1-alex.bennee@linaro.org> References: <20161011161625.9070-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::233 Subject: [Qemu-devel] [PATCH v3 5/5] tests/docker/Makefile.include: remove verification targets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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(-) -- 2.9.3 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: