From patchwork Wed Feb 9 14:59:08 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: 541122 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp1480446imo; Wed, 9 Feb 2022 08:23:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJw1dM/lK0hVNCyd525G5plVsnfwU1O0R+dc+5SNXXrgIO784hRr7h9TKSttN/GaCLhT1K2A X-Received: by 2002:a5b:906:: with SMTP id a6mr2855270ybq.544.1644423787065; Wed, 09 Feb 2022 08:23:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644423787; cv=none; d=google.com; s=arc-20160816; b=MpGjLTtBqMaLmxBOaf2e/spf3IK1Fv3dLc3LePKjfa8wfOQBbjJ7T+MoRDsvMaT8vv GM59G6j5XPT6ckTG2SLpKOzyW/FwxG10NYUub9U2FHSxf8C+e+toX+X/Jk03mAIQ+ZEb QBe+Wmz1lHfdfUtHt08SDhdBR5PBThjjixYdfCLgi1o5uopiBzBNA8msIs1yxDCnVEEH ZFiN7oyniXVygdzUyxarmvh357zO2au4O3aSp94Y3pmObcCSwCnO5sVT7bDxRaxfg5TR /6YhIB4GWissA4eJh+OuDGTdwNCiVvgb/Cks37REZnbE6uqXds+0zZACaSY81DJvj02T 40pw== 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:message-id:date:subject:to:from:dkim-signature; bh=95VUsInsBJkWydqDjFNp5aZcy3HHZ58V16PSGr8vvHk=; b=ogAuMfabVY/rMq4/MvLbYoaYfQ+kpzHXql8EBY6I8L6MDFJC4pJKFEp3G1NH08vC2Q NegKh8hTaQD5jWNiABC18YZE8sjR3sLFXoy1heDHIQt/O5lwG+9eLVJFkp/0FebRH51Y 3zkrJigiumnh8lmeKmO1GlsEdhEYJaYTQD3YJuRwcsjgnvaWGjYdKwVLBemZViF3xGZl CyVHw2FJtdOOLzJLOFDcOR2MSwQhCGBp8DGmzqFDltC5ZzVUeAxI2ooBEoVc4trleVYE 4+DyObmdUsImFmkMJBEmmRhh+aUZSJcMmqapZXVMEXcPFAitv7PrG4uvykLMfr+DFuR1 pMbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=n9cCdKCa; 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 186si12190875ybr.203.2022.02.09.08.23.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 08:23:07 -0800 (PST) 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=n9cCdKCa; 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]:41168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHpkI-0000fF-BA for patch@linaro.org; Wed, 09 Feb 2022 11:23:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHoRH-0001m8-Q9 for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:59:24 -0500 Received: from [2a00:1450:4864:20::529] (port=41807 helo=mail-ed1-x529.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHoRE-0004Ci-KZ for qemu-devel@nongnu.org; Wed, 09 Feb 2022 09:59:22 -0500 Received: by mail-ed1-x529.google.com with SMTP id cz16so5602229edb.8 for ; Wed, 09 Feb 2022 06:59:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=95VUsInsBJkWydqDjFNp5aZcy3HHZ58V16PSGr8vvHk=; b=n9cCdKCa+Y1dHVx9nOsop7rdkw2tFHm82VIRtxm6C6BelZCdRsgd+YjpnppmQNlW/7 kX0+QeJPOynk8bazEZjTsu0td6/5m0f4IEqGLB0o+pZ3PurPjM45jVyen+p+lxagKX7X 6aJU07fAOtf8yTtMWSnUYfuf4VTVR4JFxzsQdVOgQvGa87OzLDJ3QjjmkUkDw8RNNMfY 79UjZXfF9NPFrkeuRyKTwaHGV35sn8wsJlJDJU84vCK8RhOMZRTwVHbR45P76kMvEeGR EOTdmbpI3MWNguKFvkSx4/OmV+YwEIwqHywQ+Q94BYRPo1SxHGoE96qcxwfjUlFCDdHY Fcow== 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:mime-version :content-transfer-encoding; bh=95VUsInsBJkWydqDjFNp5aZcy3HHZ58V16PSGr8vvHk=; b=uBRd/w5V36wwFJMqfAU3h6ZEK8Wy542Tu8PG3Etywa/luaArQ8xWnwbwcWiR15dCDg P1nyFJus0W+7aqCuZr52opSoVkt8QIV47xw6D5KQVZkjrMRuljYdu4VcGgZwiqRkLNpw EDeEyD8M1Vr4rwUEjJwwKnoaheWYZETVOa+mYL0RUNGRdyOso4S6yPggT6REWuptQrSx jBagmtM3bGr2lEp/5NYWWcngd++6w1NCG2RdocgBq0KHaJ06XlKBW3iXtYVY3eHnVSa7 lDEjy0ZTsU+4btSlD+KGNVHxvOcomPcDuE8fG0SXuM1TzKn3IGMmX3g39h5fqdJLk4T0 d/Vw== X-Gm-Message-State: AOAM531nCZMec4F8sgdEAWO/mKiW/dht3B0A40a3l6GRRcrqJ0XOab+r 6ovdE8uG1Zc/pOsRYA+NBhOQlA== X-Received: by 2002:a05:6402:4305:: with SMTP id m5mr2933292edc.342.1644418755659; Wed, 09 Feb 2022 06:59:15 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i17sm6785147edv.40.2022.02.09.06.59.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 06:59:14 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DF1BC1FFB7; Wed, 9 Feb 2022 14:59:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [RFC PATCH] tests/docker: restore TESTS/IMAGES filtering Date: Wed, 9 Feb 2022 14:59:08 +0000 Message-Id: <20220209145908.3432580-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::529 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x529.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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.001, 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 , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Alex Williamson , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This was broken in the re-factor: e86c9a64f4 ("tests/docker/Makefile.include: add a generic docker-run target") 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ée Reported-by: Alex Williamson --- tests/docker/Makefile.include | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) 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 := , HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m)) +# These variables can be set by the user to limit the set of docker +# images and tests to a more restricted subset +TESTS ?= % +IMAGES ?= % + DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES := debian10 debian11 # we don't directly build virtual images (they are used to build other images) DOCKER_VIRTUAL_IMAGES := debian-bootstrap debian-toolchain empty -DOCKER_IMAGES := $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) +__IMAGES := $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) +DOCKER_IMAGES := $(if $(IMAGES), $(filter $(IMAGES), $(__IMAGES)), $(__IMAGES)) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache @@ -23,16 +29,14 @@ DOCKER_DEFAULT_REGISTRY := registry.gitlab.com/qemu-project/qemu endif DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY)) -DOCKER_TESTS := $(notdir $(shell \ - find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) +__TESTS := $(notdir $(shell \ + find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) +DOCKER_TESTS := $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS)) ENGINE := auto DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) -TESTS ?= % -IMAGES ?= % - CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME) @@ -274,8 +278,8 @@ endif @echo ' TARGET_LIST=a,b,c Override target list in builds.' @echo ' EXTRA_CONFIGURE_OPTS="..."' @echo ' Extra configure options.' - @echo ' IMAGES="a b c ..": Filters which images to build or run.' - @echo ' TESTS="x y z .." Filters which tests to run (for docker-test).' + @echo ' IMAGES="a b c ..": Restrict available images to subset.' + @echo ' TESTS="x y z .." Restrict available tests to subset.' @echo ' J=[0..9]* Overrides the -jN parameter for make commands' @echo ' (default is 1)' @echo ' DEBUG=1 Stop and drop to shell in the created container'