From patchwork Fri Oct 28 16:33:39 2016 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: 79986 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1272547qge; Fri, 28 Oct 2016 09:48:26 -0700 (PDT) X-Received: by 10.31.15.65 with SMTP id 62mr12078862vkp.93.1477673306273; Fri, 28 Oct 2016 09:48:26 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h27si6654969uab.87.2016.10.28.09.48.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 28 Oct 2016 09:48:26 -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; 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 dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0AKP-0000O6-31 for patch@linaro.org; Fri, 28 Oct 2016 12:48:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0A6K-0004mT-9n for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:33:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c0A6G-0003HA-42 for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:33:52 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:38215) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c0A6F-0003Gt-Sy for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:33:48 -0400 Received: by mail-wm0-x22b.google.com with SMTP id n67so125564285wme.1 for ; Fri, 28 Oct 2016 09:33:47 -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=I1QIr6mbnULcthdCXjBuJxMil2PgYCOZc4ZdOd5RQD4=; b=NsagSpzl/x43TjQzHUXkHe5/DNwt9YrNcskU3KZ1McLwNLoAbnruGAB4e0E1ih9RU6 138QJXVU7fISmuKzRnKjWtxAsLFpGcNmY9b3y540h1zoL8k9tARWCxsNxmn+Og7u5gDU 0K+Av0L7haQNmASQmN3i9N3MoqoSN1gymChbo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I1QIr6mbnULcthdCXjBuJxMil2PgYCOZc4ZdOd5RQD4=; b=m7H+OD6i4w1qLScCnzoakN7PACC0QlbEX2Y/kFJcUHCPHcnCFNgRx1QuFvXG1iNkIv mgfINBmNat5xmduweSmmscxUNy88QuitUMnW1vs33VZ7fePEFHH7Ru4V4vusFUp/hBTl dw10OWzSPgRU4nbXUXInASWH0sX+UtnPAsrDihg0jrHKdQ2PaEUM86Up4ukOTaKnOGvQ 3rYhj8JfNBSDD2fmvaFqTy1M2kEhXx3BdKgIbPUJuwlCVxpnauNFhzbfRLSQmHRYEnok NHGSZhmy+A2dpUP62bwsOkT65rNVVQdy3wfVMiK8TOByZawAK+++D3C9woTzNqJ1vww/ rXHQ== X-Gm-Message-State: ABUngvdBL/1G5Zb41Rnk6ghOII9ln3RE2D5ycxtDf15mYHtHnthq8WcJ2R+JqmqIcXx2KN4u X-Received: by 10.194.246.169 with SMTP id xx9mr12216354wjc.76.1477672426618; Fri, 28 Oct 2016 09:33:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id jx8sm14952815wjc.2.2016.10.28.09.33.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Oct 2016 09:33:44 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 18D1F3E0312; Fri, 28 Oct 2016 17:33:43 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: famz@redhat.com Date: Fri, 28 Oct 2016 17:33:39 +0100 Message-Id: <20161028163339.31096-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161028163339.31096-1-alex.bennee@linaro.org> References: <20161028163339.31096-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22b Subject: [Qemu-devel] [PATCH 6/6] tests/docker/Makefile.include: expand docker help text 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" No we can query what has and hasn't been built we can make this list available in the help text. This is useful as some of the bootstrapped builds can take some time to build. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.10.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index bb9e078..a19991b 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -80,6 +80,10 @@ docker-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker --include-executable=$(QEMU_EXEC),\ "BUILD USER","$*") +DOCKER_USER_IMAGES := debian-stable-armhf debian-stable-arm64 +DOCKER_BUILT_IMAGES := $(shell $(SRC_PATH)/tests/docker/docker.py images --repo qemu) +DOCKER_UNBUILT_IMAGES := $(filter-out debian-bootstrap, $(filter-out $(DOCKER_BUILT_IMAGES), $(DOCKER_USER_IMAGES) $(DOCKER_IMAGES))) + docker: @echo 'Build QEMU and run tests inside Docker containers' @echo @@ -96,8 +100,11 @@ docker: @echo ' docker-image-IMAGE: Build image "IMAGE".' @echo ' docker-run: For manually running a "TEST" with "IMAGE"' @echo - @echo 'Available container images:' - @echo ' $(DOCKER_IMAGES)' + @echo 'Available built container images:' + @echo ' $(DOCKER_BUILT_IMAGES)' + @echo + @echo 'Available (but unbuilt) container images:' + @echo ' $(DOCKER_UNBUILT_IMAGES)' @echo @echo 'Available tests:' @echo ' $(DOCKER_TESTS)'