From nobody Tue Feb 10 11:15:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164612829838384.38226831826694; Tue, 1 Mar 2022 01:51:38 -0800 (PST) Received: from localhost ([::1]:51240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOzAP-0007gH-9Q for importer@patchew.org; Tue, 01 Mar 2022 04:51:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOz6G-00037B-GL for qemu-devel@nongnu.org; Tue, 01 Mar 2022 04:47:21 -0500 Received: from [2a00:1450:4864:20::42c] (port=42619 helo=mail-wr1-x42c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOz6E-00073k-Pl for qemu-devel@nongnu.org; Tue, 01 Mar 2022 04:47:20 -0500 Received: by mail-wr1-x42c.google.com with SMTP id d17so19490802wrc.9 for ; Tue, 01 Mar 2022 01:47:18 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g6-20020a05600c4ec600b0037bf934bca3sm2350448wmq.17.2022.03.01.01.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Mar 2022 01:47:16 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 612AF1FFB8; Tue, 1 Mar 2022 09:47:15 +0000 (GMT) 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=Oo9DRbZoIDPeCuEDR0VO57zAdlBhs+L621CLCEIHwtk=; b=Zk/T2sOCmJeYjBQgaYl7QNnepvHwkPOjWTdH3D3/YYRZDZ/kIeMArU5gLLZkEM5l40 WCmfbOrPZLEJ6AW/usb56+6C9nZPaQV9OtdQfFcuAf4696htt9wjMt0CazpVDF1biQln 71GKaTfy74AwaBtGygDRTltKisThhjxXd0jexFRQXdpVlNbQWXDgNE0LkHiCrV52Em9F MjvnfadcximuS9zqDkeSlwRw4UPJVpzeRKU+Z9BESqC1CZ5ewXi4ASILswgfTQwJktdy eMvnkmRkeXAW0ih+9GBgJg7mRt0IFTvEecMmB1ajDGUENI4OCJa3sIux9+7MYFc7AsA1 U7ug== 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=Oo9DRbZoIDPeCuEDR0VO57zAdlBhs+L621CLCEIHwtk=; b=xunLTl6VXwpYTsKTs1vxNogUgKgJY7fZdGNtNP5d0vRGVQ3476o1+dIeWNVV1ndGhF HQOgeQFqB6BKDcbBZK19S/wuQmA0gJJi981TtMbI/lXk6FYKIMCpE/rViVcG13t14j21 Pr237+krWQ7MkhMkiZGcUacLnqmkq9T/GTxaEh8PByev+i/8ugI+rN93H/U+KCJZI076 IsAxZwPwWlWu6XOp0HNPMZpTCudjdUVazLGWBj2N32ymFfgt/zTDGjX74zRJ8WBwUtRH pxozWQmdnIdXez4Emepa7tRxy6sYIf+rvx0tzoz6A57r/uPu66L84cc8HwKs2twdL2P5 XbIw== X-Gm-Message-State: AOAM532QJ5o2MyMJ9ldGY4Y4FfNCgYh6L3lC0VgstVPd5WYcN2RBjkzt jC2HlEiOGxcRHw2voZnB3odWTg== X-Google-Smtp-Source: ABdhPJw70rkQ9myngPennnKMw6PjpsLzdUl4HcWV7Vbx34q6Agga/8sA4JvI7X61a0TmYRe16HW18w== X-Received: by 2002:adf:d84e:0:b0:1ef:9517:c7da with SMTP id k14-20020adfd84e000000b001ef9517c7damr9546762wrl.588.1646128037123; Tue, 01 Mar 2022 01:47:17 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 01/18] tests/docker: restore TESTS/IMAGES filtering Date: Tue, 1 Mar 2022 09:46:58 +0000 Message-Id: <20220301094715.550871-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220301094715.550871-1-alex.bennee@linaro.org> References: <20220301094715.550871-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42c (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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 , Richard Henderson , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alex Williamson , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1646128299244100001 This was broken in the re-factor: e86c9a64f4 ("tests/docker/Makefile.include: add a generic docker-run targ= et") Rather than unwind the changes just apply the filters to the total set of available images and tests. That way we don't inadvertently build images only not to use them later. Signed-off-by: Alex Benn=C3=A9e Reported-by: Alex Williamson Reviewed-by: Richard Henderson Message-Id: <20220225172021.3493923-2-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index f1a0c5db7a..0ec59b2193 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -8,13 +8,19 @@ COMMA :=3D , =20 HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) =20 +# These variables can be set by the user to limit the set of docker +# images and tests to a more restricted subset +TESTS ?=3D % +IMAGES ?=3D % + DOCKER_SUFFIX :=3D .docker DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 # we don't directly build virtual images (they are used to build other ima= ges) DOCKER_VIRTUAL_IMAGES :=3D debian-bootstrap debian-toolchain empty -DOCKER_IMAGES :=3D $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir = $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) +__IMAGES :=3D $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(bas= ename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) +DOCKER_IMAGES :=3D $(if $(IMAGES), $(filter $(IMAGES), $(__IMAGES)), $(__I= MAGES)) DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds DOCKER_CCACHE_DIR :=3D $$HOME/.cache/qemu-docker-ccache @@ -23,16 +29,14 @@ DOCKER_DEFAULT_REGISTRY :=3D registry.gitlab.com/qemu-p= roject/qemu endif DOCKER_REGISTRY :=3D $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTR= Y)) =20 -DOCKER_TESTS :=3D $(notdir $(shell \ - find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) +__TESTS :=3D $(notdir $(shell \ + find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) +DOCKER_TESTS :=3D $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS= )) =20 ENGINE :=3D auto =20 DOCKER_SCRIPT=3D$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) =20 -TESTS ?=3D % -IMAGES ?=3D % - CUR_TIME :=3D $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) DOCKER_SRC_COPY :=3D $(BUILD_DIR)/docker-src.$(CUR_TIME) =20 @@ -274,8 +278,8 @@ endif @echo ' TARGET_LIST=3Da,b,c Override target list in builds.' @echo ' EXTRA_CONFIGURE_OPTS=3D"..."' @echo ' Extra configure options.' - @echo ' IMAGES=3D"a b c ..": Filters which images to build or run.' - @echo ' TESTS=3D"x y z .." Filters which tests to run (for docker-= test).' + @echo ' IMAGES=3D"a b c ..": Restrict available images to subset.' + @echo ' TESTS=3D"x y z .." Restrict available tests to subset.' @echo ' J=3D[0..9]* Overrides the -jN parameter for make co= mmands' @echo ' (default is 1)' @echo ' DEBUG=3D1 Stop and drop to shell in the created c= ontainer' --=20 2.30.2