From patchwork Tue Jun 14 00:42:06 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: 581635 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2470180max; Mon, 13 Jun 2022 17:45:51 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ucD76lUqjTSK0x/kyR8W65m4zIxFqWRzMoClbQf8ZLFyQb6PReyZ9UfUqXW0o+dqKQlt1J X-Received: by 2002:ad4:5c4a:0:b0:464:5920:7c1a with SMTP id a10-20020ad45c4a000000b0046459207c1amr1526024qva.58.1655167551590; Mon, 13 Jun 2022 17:45:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655167551; cv=none; d=google.com; s=arc-20160816; b=qQBruNcd4IXny28hgEEFXw6cxM+iWnYb9je9qJDN25AKTao6hNWrF5IimE5fj90mot M8erOGfSrJZK0r8emnjw7Qfyk+Ygoral9+pmdBKsKHE2U9oOKICSKbSyKcznubHPlRzE BvvENrbQqunvFYczGN62gyGlN6mmPqNnnFaekxqTDq+WerAjMKvDL4xHKwRJwJJQMzTa Jx3MO9djhTkUtSyCxdakS+2JnTEtM5wZSwvMJW5R25+2edVJyKcvbwcJ7JmFilYVraIw MRVIKLnO1bUiZynVjUV1TQ2vKe5H2vuT1+ac4YTFaFqShTpzG503yZXnNqyoPlI8LNaC e45g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=QpcYgP5Z0SucUsQZRew2vO/aiQde3BIgiJO1uRCHwhY=; b=qTGN2EOTjXn7xBxQRlpl6g7lM0BFLOSD0vNiZrkfX3xaA449FF3K12zCKzSxEg7cTc 3G3Oqz6XgsjmsldosUHqF1G6YUNDy04PUU4/epj7MwdIUyxleOVdXTPuWFkGmGc3HMF4 lCACVsgDn8dk+CLhitimUR56hDG3RIwg3+yRGECY4ZKfmJbgj28m4QyloEwi9atRjSU/ OFDg51u3ml+d3+hBDXGVlHL4ix5FZqvd/Vl1+T/AGoK94tYc2bmyfn3y99ILGO1nm/wi M3ZuVvj94X4QBPheZ6KDBL1C/XrpUmmtTb9o3IUMHfaEzidepDt8ns33HVCu1kujm7Ca sRpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R16nslKp; 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=pass (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 l11-20020a05622a050b00b00304d85c5d24si5862571qtx.3.2022.06.13.17.45.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jun 2022 17:45:51 -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=pass header.i=@linaro.org header.s=google header.b=R16nslKp; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0ugp-0001vV-4n for patch@linaro.org; Mon, 13 Jun 2022 20:45:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0udR-0008Q0-Sz for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:22 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:41918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0udO-00052Y-84 for qemu-devel@nongnu.org; Mon, 13 Jun 2022 20:42:19 -0400 Received: by mail-wr1-x42c.google.com with SMTP id k19so9061229wrd.8 for ; Mon, 13 Jun 2022 17:42:17 -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=QpcYgP5Z0SucUsQZRew2vO/aiQde3BIgiJO1uRCHwhY=; b=R16nslKp9bvhKZhgxAUwLbsQXAb7QSXxwacphLpbz2yxC5KuPhhOh6SouCt0jKexl8 Zw4QWos+TqLVZCGdZOseGcaNiH2jR0sZVRtZGIA4GzodJj74s9K6QlaJipZKMxu0Ej2Y 4urES5URbhW5kA6CaBbDTVzYX14Arb7CkEnUX5sC/TfIPKpB/5RTyjHfiX6uGDMd8thz PcoadWK/QrjrjIykGhqaGpiuk2Ir4+pVzb5srdJ5HmAUOV7LRUo8bgW9+PJcQWjC97QK 2F+36IgjAEjva6BDkciDl6qpRvyug26JZ+qWP5+VpPNNtK3eMln5x9JVEapaiHGFwa72 +SrA== 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=QpcYgP5Z0SucUsQZRew2vO/aiQde3BIgiJO1uRCHwhY=; b=UB3+R/HC2v3Hk+HfL4js9BR75aWbhRzj9cLbm7y/O8mvTkk6UuakrkbA8j87u2W5OR UZ07KVx1yXGuXGepuRKEa3UkKiwciNE/cRRJbFBuXzdtc9823p8vVOgnapLwxGFm1/Ts p561EKyZ0hXcASg6mFcdNmejKQVfgmsLcyErDk6vISErh8LqeXOo03iEH9M/MqSzJ9Uf szS2OzofhbpGZJOdI85aVy4l4injCUV4bATC2tDtcU4nMCjPiaYs5zaspTR3mXRliILv PqEggbHDH2gh2n+yhOTGfs2BwRsE9yMSFbUqjksziqpQEzDhETo4pI4w2O4Q1rAMSrwb JtfQ== X-Gm-Message-State: AJIora8UjDnRPNsL40kkMu+Dp+X693Nh/i9QDTGhNInx5raA3Mg9Mt83 Bnn5anDsTTehnskgx/L9bMkQeg== X-Received: by 2002:a5d:4405:0:b0:219:e73e:8312 with SMTP id z5-20020a5d4405000000b00219e73e8312mr2175047wrq.499.1655167336247; Mon, 13 Jun 2022 17:42:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k11-20020a056000004b00b0020d02262664sm10065679wrx.25.2022.06.13.17.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 17:42:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6540C1FFBC; Tue, 14 Jun 2022 01:42:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 4/7] tests/docker: fix the IMAGE for build invocation Date: Tue, 14 Jun 2022 01:42:06 +0100 Message-Id: <20220614004209.1970284-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220614004209.1970284-1-alex.bennee@linaro.org> References: <20220614004209.1970284-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We inadvertently broke the ability to run local builds when the code was re-factored. The result was the run stanza failing to find the docker image with it's qemu/ prefix. Signed-off-by: Alex Bennée Fixes: d39eaa2266 ("tests/docker: simplify docker-TEST@IMAGE targets") Reviewed-by: Richard Henderson Message-Id: <20220613171258.1905715-5-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e68f91b853..ef4518d9eb 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -171,7 +171,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; @$(MAKE) docker-run TEST=$t IMAGE=$i) \ + $(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run TEST=$t IMAGE=qemu/$i) \ ) \ $(foreach t,$(DOCKER_TESTS), \ $(eval docker-all-tests: docker-$t@$i) \