From nobody Tue Nov 4 15:26:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153020481339879.7981918014342; Thu, 28 Jun 2018 09:53:33 -0700 (PDT) Received: from localhost ([::1]:37618 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYaAm-0002tp-Lq for importer@patchew.org; Thu, 28 Jun 2018 12:53:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYa4w-0007RX-04 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYa4v-0004lp-12 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:30 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:42907) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYa4u-0004ku-Sl for qemu-devel@nongnu.org; Thu, 28 Jun 2018 12:47:28 -0400 Received: by mail-qt0-x242.google.com with SMTP id y31-v6so5314464qty.9 for ; Thu, 28 Jun 2018 09:47:28 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 32-v6sm4548361qtf.13.2018.06.28.09.47.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 09:47:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8qraNdm823HDVkQ0rZmKCKTEA+7cIJbvC7DeIN1v4sg=; b=ugEwYGAkEQtY5iyeoWvDBjy22SJuUj0oZ6w3RaTK0hjWe0o2qeULttwr6Q+yjYcv0b kK0qr+QD1bgbp+tJ6ebl3b1huzEhUIwTV9I+79tCdX6jP1xPQ8MT+5GoX0Qun7hYwBBs cbbF9kogjDt1UlPN42G0cYVeekjAmNWWJDKXLIAMxDjwadm3G5zIcsLUloq0TzMb43tb evalE03YR0yQZIMI8TmezKKp0JeNySDD8cTx0Toyc1fJgFcvXJB29qMR6RmtR+IhzDqQ VpCp5qHZUFEs5KAWw4qUZmpM4C5RP8jfIqjEnrn0UNM2lK+x0NhX0Z5W5oP7fZ0Bl3DI zLXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8qraNdm823HDVkQ0rZmKCKTEA+7cIJbvC7DeIN1v4sg=; b=HMCIS71RVlciEqhOUz4hVDx78w5Dz7lVGlDsEIval4bZM5/x6ir040aLq/ckwKrgQN ZNPaNDOeizaUyCdM9gcnkyMTGIXbueEBS0+QeFg62MY8dfsuRbGRux3SSpk9OXfah5eY x+PoTabfZGhYreG+shfBl5h3jQMPz0xL7U87/eZZhJp+HIuN329dnlF5+D6OUDExpoXb 4kUcV9p3tce+0MGNsYpelBSOKakK7ph9aWC964bAtInL7xe+K5P/uA3iUBTmva2xoOdv NG86kVpFMQzf1rTBAU1P0nfmTSy/uvmIpDAfKx05SOUDZf5rTmPrw4Y4trTb2Z9f71Q3 J5MA== X-Gm-Message-State: APt69E1ZHf65S5UpNgdgwCfsx3fOab7SIOqVXFwwJs/vM82nx8RUds3f WuyZx+jCA5B/ih/sJgmM5Kw= X-Google-Smtp-Source: AAOMgpeFS0wU1Q4PSIHI0RDmH0y6P3GFw0xgCxW9GrqWKoKyBak0UyU6c1RV9vOtxT+UX+lV25Pumg== X-Received: by 2002:ac8:3477:: with SMTP id v52-v6mr3851912qtb.316.1530204448326; Thu, 28 Jun 2018 09:47:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Thu, 28 Jun 2018 13:46:41 -0300 Message-Id: <20180628164643.9668-7-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180628164643.9668-1-f4bug@amsat.org> References: <20180628164643.9668-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH 6/8] docker: Do not run tests in 'intermediate' images 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?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 We can still build the DOCKER_INTERMEDIATE_IMAGES images, but they won't appear in 'make test*@$IMAGE'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7d9d568eee..301ee68ae6 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -5,6 +5,8 @@ DOCKER_SUFFIX :=3D .docker DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES :=3D debian +# we don't run tests on intermediate images (used as base by another image) +DOCKER_INTERMEDIATE_IMAGES :=3D debian8 debian9 debian8-mxe debian-ports DOCKER_IMAGES :=3D $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdi= r $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -98,7 +100,7 @@ docker-image-travis: NOUSER=3D1 docker-image-tricore-cross: docker-image-debian9 =20 # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ +$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(= DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ --=20 2.18.0