From patchwork Wed Apr 20 18:08:17 2022 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: 564012 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp4426158map; Wed, 20 Apr 2022 11:47:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuG19xq4MwmJkX4LRd8SzAOrNQzrnrNpVzPK+waEPWsi6wj90MMVr4AD2sp02xugYvxPfK X-Received: by 2002:a0d:e407:0:b0:2eb:3fa6:cda0 with SMTP id n7-20020a0de407000000b002eb3fa6cda0mr22272033ywe.158.1650480429597; Wed, 20 Apr 2022 11:47:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650480429; cv=none; d=google.com; s=arc-20160816; b=EWlOUx3g46JcEsNi92u9lPMOUSy1GdMMTdSEfqmFkYGLUwrlAtfdR1KVUpi0A5EgHa 8+AFq518DsE7AySMMcRLHneeV7jAJiCwlgJxwLcYK/I9+TI7EU1K1/EbHJBhmkLU1Rpj MZXF9EmC7O7E36T97ayz+2CAi6rw0gT/LUy+EWi7ZHBDg4bhyP1TkvkzKXWRn2JgiR1/ Y2w5dURBJIyNFNi72PBPp+yj33Tkb2FWuk5m1PSzwe5/ne3oPEAbffO/53LKI2ZnIiHo TBy9cQ3fufJdzazxMvSiGy/YmY071Uck/5pneFRBs9dMHRltkNWXk4YZMrnHNyVfkA7+ FTlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=xtk7gIVkGZCQg1kwV2ABaygwIQfaHWrzcnW4atzxfQs=; b=DqH0LGgPYSYUo/Rdb1ZcuLOQcu6RQD9X9FyxAzZNNELSCXTcJlR2RMDHSbtTXxL9i5 SmpO8tl9wuE11T5T4jvr9GdHMhHqN1W4xUCKfHUwKu6AmNsSGbTPm9HFMv3ZTf/Bk2f6 3zhUSgBXyD0arKmxGykR6hs6KM0kMzHeixPIWdKzKjwmWPYPoxr5EUMldJcdUNEMzfUk LEiL/w3/pwy7qS5ryElCxQUY0VpxhJWsNSpHORIeZgo3iWLIcgXHlphwsZSilhljPhsB EdQT2QFFZEoU0VXqTpionpdpZybKB4vvpIkVU084WqUKgzY7U0HDi+/aXFvHK1uc5jQg aiOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aqkcLitS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f23-20020a25cf17000000b006413bd30015si699791ybg.429.2022.04.20.11.47.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Apr 2022 11:47:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aqkcLitS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhFM5-0004Yl-2B for patch@linaro.org; Wed, 20 Apr 2022 14:47:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhEky-00024A-DS for qemu-devel@nongnu.org; Wed, 20 Apr 2022 14:08:50 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:42948) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhEkw-0001Zf-T9 for qemu-devel@nongnu.org; Wed, 20 Apr 2022 14:08:48 -0400 Received: by mail-ed1-x530.google.com with SMTP id t25so3347243edt.9 for ; Wed, 20 Apr 2022 11:08:46 -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=xtk7gIVkGZCQg1kwV2ABaygwIQfaHWrzcnW4atzxfQs=; b=aqkcLitS12OADJSRxZp1BFdFOhntUzKp3MLgNeMW611rfIkrpsIIgmEL28PJtecXPq SBMJODUVBk/qI8CA+AUKkXwJCskNBB9g5afbOw4Av/LkBFuJzYJ7RwGRiTa/RjsTG8hq t7MYIfhethDOOkdYgAS0MYHUaC41Oho5IeYi2zxEWTHw0q6/qCfHhEOJXXVuSriNTq54 tqcy+lYZRDDwTTNfmt5a2ay7kjqBCrrOtky5T+31Ki+6a+0hIRP0Q5c2qFiJkjxJA+rr UB6j5/bd6v1Px6mVTVIXtaAaytT+A+Ld+E2FW/yJF/JbOza+WwAj0qC5xvl2Qpy7I6vc qgIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xtk7gIVkGZCQg1kwV2ABaygwIQfaHWrzcnW4atzxfQs=; b=YxYFbRVtyig8iNYksd7miwfdCw7olC5ayoG8aDNzZsDRbm2pXDdAm0qzybqDSdAH03 /xqfLU0eppQcbFGXsYYDnxQhwg+X3JNVWOc4/uSR3oKM7yH3Ge4SXzfB/0HFxxijEq94 41sVE6ytQFZj/xwwylYReLaaSzzVuQ43NPBzqCMWrSzs2k0PBARizJZOL12wV92vlAVG zxouGZyeuom4TyWTn5feYAL6VobQ7h/RuS1Zeh6eL5feppAPlW5IuVyK+Mnrls6kVMwf kLpYQeu7BenD+/p0j1RxOFZFttGEp6mzR34BwmI/41LgEfcjkp0+3yMKYEGePedb+Hys vCxw== X-Gm-Message-State: AOAM530ceqFQI+ZxEhWD1nkyuQrFRjiXEqL0b5zJOKQ4d+RIbcO29ptW D6MplWJE6yL4uMyToyj0oA4TAw== X-Received: by 2002:a05:6402:1d4b:b0:416:13bf:4fc5 with SMTP id dz11-20020a0564021d4b00b0041613bf4fc5mr20872031edb.115.1650478125565; Wed, 20 Apr 2022 11:08:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n15-20020a1709062bcf00b006ee82143cfbsm6223556ejg.51.2022.04.20.11.08.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 11:08:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 181221FFC2; Wed, 20 Apr 2022 19:08:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Subject: [PULL 10/25] tests/docker: simplify docker-TEST@IMAGE targets Date: Wed, 20 Apr 2022 19:08:17 +0100 Message-Id: <20220420180832.3812543-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220420180832.3812543-1-alex.bennee@linaro.org> References: <20220420180832.3812543-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Beraldo Leal , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini No need to go through the shell when we already have the test and images at the point where the targets are declared. Signed-off-by: Paolo Bonzini Message-Id: <20220401141326.1244422-8-pbonzini@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220419091020.3008144-11-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 3b5ebd5567..2a187cb5a2 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -204,7 +204,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 docker-run-$t@$i) \ + $(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run TEST=$t IMAGE=$i) \ ) \ $(foreach t,$(DOCKER_TESTS), \ $(eval docker-all-tests: docker-$t@$i) \ @@ -263,7 +263,7 @@ DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make -# docker-test-foo@bar) which will do additional verification. +# docker-test-foo@bar) which will also ensure the image is up to date. # # For example: make docker-run TEST="test-quick" IMAGE="debian:arm64" EXECUTABLE=./aarch64-linux-user/qemu-aarch64 # @@ -298,14 +298,6 @@ docker-run: docker-qemu-src $(call quiet-command, rm -r $(DOCKER_SRC_COPY), \ " CLEANUP $(DOCKER_SRC_COPY)") -# Run targets: -# -# 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-%: - @$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu/$(IMAGE) - docker-image: ${DOCKER_IMAGES:%=docker-image-%} docker-clean: