From patchwork Tue Jul 17 19:55:43 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: 142204 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4070680ljj; Tue, 17 Jul 2018 12:59:06 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfWJLE1sYk6LFiru9a3eAMH4C+cljaDlgHj15RSMC96PiMBuqtYBByqSgyQRL70Aa70VY7O X-Received: by 2002:aed:2d63:: with SMTP id h90-v6mr3040895qtd.190.1531857546209; Tue, 17 Jul 2018 12:59:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531857546; cv=none; d=google.com; s=arc-20160816; b=ZEabOHKt1ABaaa+j0h7O1J+9F7ekq1vjtHDv/SJURbZVKv8j/74jAWzwpNSRbBgV4z JQ2baU0n/O3BZ0eCTEzDKn/TgAzFeZSffayN+CASDRxnEIZNicGCfi6qd4H1XS7tnktk GJgmS8KADgRBtKhEeIhpMhXgta6XpM9m82IUQRtMNARbCYSZD4pSNSKF/QDDyf7HCw1p it2/0bHpUOKlc+Snr+IMz8QJ+ZhX7q0xR/huHyXIOz2sT6PPAoD2SoG6iQVklEkviHgi diIM5gGrTguiGbWBwXF5Isn6CmJfQjVBk7cHg3ww8RTpNROZ6F/l6i069G4ZlLhq+BP5 Eemw== 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=0IPXTrop7rPReXH+K6Q0fwVmBrGTlOGdwTFq1ND5Emg=; b=k27avk1/gQ2kvKafEubU9TCMsZxFnARuinPZebd6sYo8AguwLBTH9tHAClvHUC6K9Z hDGowMHxlXLZ2LyqBIXIG/44wqYB6kjYUfzqZ9CbXP36LQPanOQdheKXR+kzhBohQwqX H+YigY2p1IPqjDb6+C2ce/0EfNqAHZH+wOxW2YtvoezNxWSKqHQBe0pw/PDjlNl4dIWK tPBh125rzBE5ncy5wAfnegmRPB+x9D+ptbU198Z0hBpNJWw1E7AQAjebbldmn0gtWxQ2 aRDEmlrzpYnR1iUX7uEqcruSIskzJjo1onkBHWvuAcbIMB5Di3PLkIqKYlXXEb/E485g lSpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MAAEuxTo; 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 r1-v6si2171103qvk.34.2018.07.17.12.59.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 12:59:06 -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=MAAEuxTo; 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]:32925 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW7l-0004HR-H8 for patch@linaro.org; Tue, 17 Jul 2018 15:59:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4t-00035G-9W for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4s-0004jX-Ce for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:07 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41021) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4s-0004in-4q for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:06 -0400 Received: by mail-wr1-x42e.google.com with SMTP id j5-v6so2374598wrr.8 for ; Tue, 17 Jul 2018 12:56:05 -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=0IPXTrop7rPReXH+K6Q0fwVmBrGTlOGdwTFq1ND5Emg=; b=MAAEuxToWtzSkZ48mEc4b62c2P+MnE2nPEoecRIoUvZujBi0enD+Rv5JZczMDGBGka 4heCnIN7Xu2WYM18CdTJGUd5iPiar5RKTnD/nuLRN/0iuzY1sEvaJXJoDFgrA1Zu/dXi j9YX4N+lyMjtjAWpBm1TiDC9r9KFbrVxgVme8= 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=0IPXTrop7rPReXH+K6Q0fwVmBrGTlOGdwTFq1ND5Emg=; b=La8K8VEAu9zUuaB+RUEaIgVvXwX7NbVXAx7+nF7xylT9exJEavH5x8ylJyz3XYL0QF eHWqTD0i4wemI6kBljiqwZHGs0yq8ftOWuoU6lHhW+S861OkFd7EjlHWQcpgzBbPBsdb dsK/IcO26eZMy/m5IpjXZCyQUpaFYNSy+Jo3vH06EGNxkQ9McFFDyAGbnvwQSOKCYtc8 URxbEfhsy6UOg5TqxPMB2eO9Cpr/I7jLow3sGZ/Mk1nVFi22KFn04oIYYLy3DW9nzlyq Eq2Iz7EywLkHsmUdh3LCM/ILxbP4MOeSWK/HbBIgpNpkWUVDXWzwVzHN8Wl3pgB7vqv0 iw1Q== X-Gm-Message-State: AOUpUlF82HwMk7iOOeLlzl0g/8vHNiU3pMf8294bOvi7iaTOv1Fzf0KI jy2kfcMniGnTW6e7EuTk7HYsgQ== X-Received: by 2002:adf:ac2d:: with SMTP id v42-v6mr2382535wrc.142.1531857364867; Tue, 17 Jul 2018 12:56:04 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l10-v6sm4059248wrv.23.2018.07.17.12.55.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:56:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7C6253E06E0; Tue, 17 Jul 2018 20:55:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 17 Jul 2018 20:55:43 +0100 Message-Id: <20180717195553.9111-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-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] [PATCH v3 for 3.0 08/18] docker: Makefile.include don't include partial 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?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rename DOCKER_INTERMEDIATE_IMAGES to DOCKER_PARTIAL_IMAGES and add the incomplete cross compiler images that can build tests but can't build QEMU itself. We also add debian, debian-bootstrap and the tricode images to the list. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b2a7e761cc..09fb7db7fa 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -6,7 +6,7 @@ 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_PARTIAL_IMAGES := debian debian8 debian9 debian8-mxe debian-ports debian-sid debian-bootstrap 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 @@ -121,6 +121,11 @@ docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools docker-image-tricore-cross: docker-image-debian9 +# These images may be good enough for building tests but not for test builds +DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross +DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross +DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-cross + # Rules for building linux-user powered images # # These are slower than using native cross compiler setups but can @@ -137,7 +142,7 @@ docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user DOCKER_USER_IMAGES += debian-powerpc-user # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ +$(foreach i,$(filter-out $(DOCKER_PARTIAL_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) \