aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2017-10-13 09:19:54 +0800
committerFam Zheng <famz@redhat.com>2017-10-20 14:28:50 +0800
commit4b2c6bc563c13f242d92fe4f8f31d22b31788858 (patch)
tree3e1799bc3b3657a2f618219339034b7056a2074e
parent063833a6ec2a6747e27c5f9866bb44c7e8de1265 (diff)
downloadqemu-4b2c6bc563c13f242d92fe4f8f31d22b31788858.zip
qemu-4b2c6bc563c13f242d92fe4f8f31d22b31788858.tar.gz
qemu-4b2c6bc563c13f242d92fe4f8f31d22b31788858.tar.bz2
docker: Don't allocate tty unless DEBUG=1
The existence of tty in the container seems to urge gcc into colorizing the errors, but the escape chars will clutter the report once turned into email replies on patchew. Move -t to debug mode. Reported-by: Eric Blake <eblake@redhat.com> Signed-off-by: Fam Zheng <famz@redhat.com> Message-Id: <20171013011954.9975-1-famz@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Fam Zheng <famz@redhat.com>
-rw-r--r--tests/docker/Makefile.include4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 6f9ea19..ab939f2 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -134,10 +134,10 @@ docker-run: docker-qemu-src
" COPYING $(EXECUTABLE) to $(IMAGE)"))
$(call quiet-command, \
$(SRC_PATH)/tests/docker/docker.py run \
- $(if $(NOUSER),,-u $(shell id -u)) -t \
+ $(if $(NOUSER),,-u $(shell id -u)) \
--security-opt seccomp=unconfined \
$(if $V,,--rm) \
- $(if $(DEBUG),-i,) \
+ $(if $(DEBUG),-ti,) \
$(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \
-e TARGET_LIST=$(TARGET_LIST) \
-e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \