From patchwork Tue Jul 3 10:14:39 2018 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: 140946 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp986623ljj; Tue, 3 Jul 2018 03:28:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf3T4N3KXWZptQVT8+7Jf/KB7/OrAXZElbOyELycOE7nt5GFuodsdjQJDXGdNOQXlvuq2B/ X-Received: by 2002:a37:9286:: with SMTP id u128-v6mr24137245qkd.29.1530613736549; Tue, 03 Jul 2018 03:28:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530613736; cv=none; d=google.com; s=arc-20160816; b=L3OPjj88LtGR2G9vnyNd+gZ6IIlzT4PRTRmemhvvhdMh5FOR4cyVIA0/dmEZ1hr1DK Y3L0kcSjDieppAiQirmgrYid11bw4OrMoauCMSDEVc7hVZe/EFL/462knbIZpcIsXPZ9 qXMdkzY85btluQvA3/F1nWmZXLwDgPw36Smkj7KPU3H27LvaUzcuEfxY0lXwYgOirgdj 3uTa/WMNAKNt0VJvO0dttD+YFE2hOug+Gwos+18zUiCxHvbLrlp2izT/gSReixWJ8xZz azNgQ71gb0PjX1Kx/aZ+3Feoe5IQrofvm2bzV77OnT6l06bRIuLf/KaZ5bbcx8w0tOwz UeSw== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=/vjdRXNILP8knJdwZtK+Uzxfa4zObr/2zkAtNixHZx8=; b=YwB809uEb5WE6iIkyjMCMj0yb+2fREikTTuxfK9grCvBT/iVu2wpip8uQrPEoU5MyP FfZtJQ/MZQg8mhnk0TWo8ETRmmoQ/yPCng0dUVQ4IR23hCPLAXjCaXFKsiCMIe5UBlQV VSVgH4IgDgcQnUshdGkQ7guWGxiQsl1ME4qkzb8BmD8ISCC0AZqOnRGHoOQVWKXpWlBa ol5fvy5BkxnXPok3aUds/wMcfTfa+lQsPkch+aCIqo4WzlcABtsJLy/yA2X4wOlR4JxN U6lf+zRQnIre8mCQn2oxPBRl4KQKsE46G4bL4qW2kkSYGHoGFCLmWrypXB4m4IK+MSZZ 2ESQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UNbwpdwx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u1-v6si815394qvd.29.2018.07.03.03.28.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 03:28:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UNbwpdwx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:39423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faIYJ-00009E-Vj for patch@linaro.org; Tue, 03 Jul 2018 06:28:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faISp-0004ZU-5G for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faISo-0004YJ-3W for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:15 -0400 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:38734) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faISn-0004Xx-TV for qemu-devel@nongnu.org; Tue, 03 Jul 2018 06:23:14 -0400 Received: by mail-wr0-x236.google.com with SMTP id j33-v6so1389834wrj.5 for ; Tue, 03 Jul 2018 03:23:13 -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=/vjdRXNILP8knJdwZtK+Uzxfa4zObr/2zkAtNixHZx8=; b=UNbwpdwxryPwD95DuyPh2QjKRCN5nTwglmVzwKpab6Zw0uQqYPxsf/1H5JhFYoSktg WeKVm5mVBozmay0h6/wbEc8f6Fryvf7HdX9osZhDc0xedCb9xAIFk3m7pfw5ZsyDTUSc eVbfpul0cvIjLbDJqy2co52iV0GQ0KQMy0HXI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/vjdRXNILP8knJdwZtK+Uzxfa4zObr/2zkAtNixHZx8=; b=GkXeE3YnywyDZNlLsvCK/RqbskKgW/9yYgqcLPBsBJmy5ymsUHI+J7nQgMv+wTAfq5 tbR1f1mykZ5jACj09UMxlek63+JPpen0W+D77ZJQ1a/NHYS503bAfLtFu6OlXOvTd2rV eVbeEc9x51LwPFQ7s8GDWpB48pCAR+l3hLF/atbUnJDB8PNV2pYHJ1PbyKM7Z7NHhcBg UZr+G5Y8ZR57Xd+JTI0HNgtfFXC+08kEocdArtEMQpWp0hctIXEO23/oZv9epwBgWXNG w0lGL0gqxs7QkX61GLabmBvYVZSkNAHEOCz/dHW4s4vZY85VJGM88w7lbxuO2CwWMe47 VdQg== X-Gm-Message-State: APt69E1hIiXgGAG4K/d8/looPMebGxn+EYrw+tsSoaExJjpXL0xT8l0i 3FrIyL3Od8/zUJvY9Kp0iDay1A== X-Received: by 2002:adf:f410:: with SMTP id g16-v6mr7000082wro.256.1530613392836; Tue, 03 Jul 2018 03:23:12 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 5-v6sm2647210wmv.48.2018.07.03.03.23.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 03:23:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B88FE3E0AC0; Tue, 3 Jul 2018 11:14:45 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:39 +0100 Message-Id: <20180703101444.23778-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::236 Subject: [Qemu-devel] [PULL 15/20] 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We can still build the DOCKER_INTERMEDIATE_IMAGES images, but they won't appear in 'make test*@$IMAGE'. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 1813ec0781..8641f5da2c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -5,6 +5,8 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian +# we don't run tests on intermediate images (used as base by another image) +DOCKER_INTERMEDIATE_IMAGES := debian8 debian9 debian8-mxe debian-ports debian-sid DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -101,7 +103,7 @@ docker-image-travis: NOUSER=1 docker-image-tricore-cross: docker-image-debian9 # 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) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \