From patchwork Thu Jul 5 16:03:24 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: 141205 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2143797ljj; Thu, 5 Jul 2018 09:30:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcolwzwWghW7zmuUGN3ZX8f19eUoi0fHBhqkOEn2bM9dAgwqqqJQSdPbupVZpDLJAhfkwIZ X-Received: by 2002:a37:4951:: with SMTP id w78-v6mr5426016qka.2.1530808235944; Thu, 05 Jul 2018 09:30:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530808235; cv=none; d=google.com; s=arc-20160816; b=beeaqWlPLecaI80VkjXvG5bOwr9B8zYQaNh/JGsJIGu5kYBZqJ2AbQlIueCf2qxjzC 35V9fLJ1bkFmNu+Ma16auiZQEn5ly/pmD4LyTJKKcYadn0e7Md4XIsR1KiUQm9usY3sc pPBGtfMG9/dAfqBZvCoxBTGs08WhdQFxRhnWxWIeOlwqVAiZYbvjniAjAJr5b0nfOzzA yoEwl1kh7x1XiUNPHLHZLj/VogktrTi5jViR9si/E9MkPI2eo2gJLU77ekC7zjGNPxHE IHnNi93ejZFKW8BRbzlCLVX/uYDeeWsjQF4cgs2Z4FMNt1ymZjcBYl93/axed8gkSKqm eKiw== 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=KeakChgu/cWY7i8HVXoFoIfxtGmhJdMcAUj7UFC/AiI=; b=dVZjaSBCXOrYuEo3jmSB3QIVAs8plv/U4oe0UiPoO9/Aaxdo5S3TOnMoevFg2N8J0+ B6ZKF07k/liRgm1OLeWy7iFm3i+R+W/sgHYS2QLAo9YQg4PlQV0ZoVDU1MGMrjKtZzAl 1QTpHZEMLlvFCOtVm5YZPGVTU0CGaiIrad5GwATRjcO83Fs+gniAnWNkgFEk8JE0NkWD KAIhs6pk3ndvxRas7vKIyPwDKbVLDvUmU40f9KaZETwokgd0sUUdriQcAx3RG9ZZlbdK GGhnOyrt4+gPf29sMG2Qk70hiRr24KUPanSlcnWIwf3w7Goc9LUN2/gkfG4TNtcrhysF RN4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HZMLH6p7; 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 r2-v6si932948qtr.185.2018.07.05.09.30.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:30:35 -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=HZMLH6p7; 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]:53698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb79P-0004R4-Dv for patch@linaro.org; Thu, 05 Jul 2018 12:30:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jR-0008RY-RQ for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jQ-000849-Rv for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:45 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41829) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jQ-00083W-LO for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:44 -0400 Received: by mail-wr1-x42e.google.com with SMTP id h10-v6so1470350wrq.8 for ; Thu, 05 Jul 2018 09:03:44 -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=KeakChgu/cWY7i8HVXoFoIfxtGmhJdMcAUj7UFC/AiI=; b=HZMLH6p79hANtOM8Q3kXUOzR2sa8NgR3I8g9dvXm2NGzaRw+an3aUb14BYxTB4GFLX Pf9YO06hBFe63utGjPHuauvkjDIOaZfj3jnKMPyXfAAZbkmTX86c/g26aCptqGLxI3BJ gdCuheSgvGcmrEEXZoXU/jHzcdUiMuDrWv9Vg= 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=KeakChgu/cWY7i8HVXoFoIfxtGmhJdMcAUj7UFC/AiI=; b=i9gLxBVNeFAxvirzySgTQ81OVo/nWkk+6AbFVwO5MEE64uwiFWh/A0uBIZdtjzE2z+ 7bD/kbiMJHQ+JkNt7Q3K1SsoKBkIKF9KIJobgFe/Rve01Ol1Oq7SMLby5OqceHa0d5PV vggsF28chFB+4AGB+kF0xGQ2ovKF1jo7nkGy7UJE1JMPM3T3zFMLcUUN1mIUkrAPKmlY y+8wdKhYoV0MCw/RzP8PyLPItRwhI0qJw7WI618NKb5nwgQhQllIKI3VGFJZdttONRmv 4Q67FZoRSJpJvsVNlrmr52TogOiuoDcMduDH9rO7dBI3+S3vH5r4ffetA0uN3MKV+P0L qDGQ== X-Gm-Message-State: APt69E3wDfbAocL3bCGY0MWgXKZ4zLg8PDn9Q2fa8p91iV0iilb0S1EL jIDxpPdOaWJyxd2OrFw9TH0coaRlKPw= X-Received: by 2002:adf:b86b:: with SMTP id u40-v6mr4920608wrf.162.1530806623556; Thu, 05 Jul 2018 09:03:43 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l1-v6sm11643614wrf.19.2018.07.05.09.03.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 83CB53E0C98; Thu, 5 Jul 2018 17:03:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:24 +0100 Message-Id: <20180705160329.30386-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-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:4864:20::42e Subject: [Qemu-devel] [PULL v3 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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 91d9665517..942d05649f 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 @@ -98,7 +100,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) \