[PULL,12/17] docker: report hint when docker.py check fails

Message ID	20180724105109.8392-13-alex.bennee@linaro.org
State	Accepted
Commit	d19f5fc0411b101798fdfc80b9680df85b316636
Headers	show Delivered-To: patch@linaro.org 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; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:04 +0100 Message-Id: <20180724105109.8392-13-alex.bennee@linaro.org> In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 12/17] docker: report hint when docker.py check fails Precedence: list Cc: Fam Zheng <famz@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	docker fixes and tcg test tweak \| expand [PULL,for,3.0,00/17] docker fixes and tcg test tweak [PULL,01/17] tests/.gitignore: don't ignore docker tests [PULL,02/17] docker: base debian-tricore on qemu:debian9 [PULL,03/17] docker: par down QEMU_CONFIGURE_OPTS in debian-tricore-cross [PULL,04/17] docker: fail more gracefully on docker.py check [PULL,05/17] docker: split configure_qemu from build_qemu [PULL,06/17] docker: move make check into check_qemu helper [PULL,07/17] docker: gracefully skip check_qemu [PULL,08/17] docker: Makefile.include don't include partial images [PULL,09/17] docker: add test-unit runner [PULL,10/17] docker: add expansion for docker-test-FOO to Makefile.include [PULL,11/17] docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set [PULL,12/17] docker: report hint when docker.py check fails [PULL,13/17] docker: Update debootstrap script after Debian migration from Alioth to Salsa [PULL,14/17] docker: add commentary to debian-bootstrap.docker [PULL,15/17] docker: ignore distro versioning of debootstrap [PULL,16/17] docker: perform basic binfmt_misc validation in docker.py [PULL,17/17] tests/tcg: remove runcom test

Message ID

20180724105109.8392-13-alex.bennee@linaro.org

State

Accepted

Commit

d19f5fc0411b101798fdfc80b9680df85b316636

Headers

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; 
From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Date: Tue, 24 Jul 2018 11:51:04 +0100
Message-Id: <20180724105109.8392-13-alex.bennee@linaro.org>
In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org>
References: <20180724105109.8392-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL 12/17] docker: report hint when docker.py check
	fails
Precedence: list
Cc: Fam Zheng <famz@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?=
	<alex.bennee@linaro.org>, 	qemu-devel@nongnu.org,
	=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

docker fixes and tcg test tweak | expand

Commit Message

Alex Bennée July 24, 2018, 10:51 a.m. UTC

When a check fails we currently just report why we failed. This is not
totally helpful to people who want to boot-strap a new image. Report a
hint as to why it failed.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Suggested-by: Fam Zheng <famz@redhat.com>

-- 
2.17.1

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 05afeb64a7..1aaa795743 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -73,7 +73,8 @@  docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
 			$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \
 			"BUILD","binfmt debian-$* (debootstrapped)"),		\
 		$(call quiet-command,						\
-			$(DOCKER_SCRIPT) check --quiet qemu:debian-$* $<,	\
+			$(DOCKER_SCRIPT) check --quiet qemu:debian-$* $< || 	\
+			{ echo "You will need to build $(EXECUTABLE)"; exit 1;},\
 			"CHECK", "debian-$* exists"))
 
 endif

[PULL,12/17] docker: report hint when docker.py check fails

Commit Message

Patch