* [Qemu-devel] [PULL 1/5] docker: Don't allocate tty unless DEBUG=1
2017-10-20 6:32 [Qemu-devel] [PULL 0/5] Docker patches Fam Zheng
@ 2017-10-20 6:32 ` Fam Zheng
2017-10-20 6:32 ` [Qemu-devel] [PULL 2/5] docker: cleanup temp directory after test Fam Zheng
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Fam Zheng @ 2017-10-20 6:32 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell
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>
---
tests/docker/Makefile.include | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 6f9ea196a7..ab939f2bec 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)" \
--
2.13.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PULL 2/5] docker: cleanup temp directory after test
2017-10-20 6:32 [Qemu-devel] [PULL 0/5] Docker patches Fam Zheng
2017-10-20 6:32 ` [Qemu-devel] [PULL 1/5] docker: Don't allocate tty unless DEBUG=1 Fam Zheng
@ 2017-10-20 6:32 ` Fam Zheng
2017-10-20 6:32 ` [Qemu-devel] [PULL 3/5] docker: allow running from srcdir != builddir build Fam Zheng
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Fam Zheng @ 2017-10-20 6:32 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell
From: Peter Xu <peterx@redhat.com>
There are temp directories named "docker-src.*" after doing docker
tests. I don't see much point in keeping that (it only contains the
qemu.tar which is exactly current tree, and the copied "run" file).
Let's remove it after test finished.
CC: "Alex Bennée" <alex.bennee@linaro.org>
CC: Fam Zheng <famz@redhat.com>
CC: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20171017071247.32355-1-peterx@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/docker/Makefile.include | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index ab939f2bec..38874ec03d 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -151,6 +151,8 @@ docker-run: docker-qemu-src
$(IMAGE) \
/var/tmp/qemu/run \
$(TEST), " RUN $(TEST) in ${IMAGE}")
+ $(call quiet-command, rm -r $(DOCKER_SRC_COPY), \
+ " CLEANUP $(DOCKER_SRC_COPY)")
# Run targets:
#
--
2.13.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PULL 3/5] docker: allow running from srcdir != builddir build
2017-10-20 6:32 [Qemu-devel] [PULL 0/5] Docker patches Fam Zheng
2017-10-20 6:32 ` [Qemu-devel] [PULL 1/5] docker: Don't allocate tty unless DEBUG=1 Fam Zheng
2017-10-20 6:32 ` [Qemu-devel] [PULL 2/5] docker: cleanup temp directory after test Fam Zheng
@ 2017-10-20 6:32 ` Fam Zheng
2017-10-20 6:32 ` [Qemu-devel] [PULL 4/5] docker: fix out-of-tree 'make docker-test-build@debian-powerpc-cross' Fam Zheng
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Fam Zheng @ 2017-10-20 6:32 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell
From: Paolo Bonzini <pbonzini@redhat.com>
The new script uses "git submodule", which is picky about being invoked
from the top of the git checkout. Invoke the script from $(SRC_PATH)
to avoid git's wrath.
Fixes: b7f404201e45e99da23b9764dec27ce5f965cdcd
Cc: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1508331989-142364-1-git-send-email-pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/docker/Makefile.include | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 38874ec03d..02cd520590 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -18,11 +18,11 @@ TESTS ?= %
IMAGES ?= %
CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)
-DOCKER_SRC_COPY := docker-src.$(CUR_TIME)
+DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME)
$(DOCKER_SRC_COPY):
@mkdir $@
- $(call quiet-command, $(SRC_PATH)/scripts/archive-source.sh $@/qemu.tar, \
+ $(call quiet-command, cd $(SRC_PATH) && scripts/archive-source.sh $@/qemu.tar, \
"GEN", "$@/qemu.tar")
$(call quiet-command, cp $(SRC_PATH)/tests/docker/run $@/run, \
"COPY","RUNNER")
--
2.13.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PULL 4/5] docker: fix out-of-tree 'make docker-test-build@debian-powerpc-cross'
2017-10-20 6:32 [Qemu-devel] [PULL 0/5] Docker patches Fam Zheng
` (2 preceding siblings ...)
2017-10-20 6:32 ` [Qemu-devel] [PULL 3/5] docker: allow running from srcdir != builddir build Fam Zheng
@ 2017-10-20 6:32 ` Fam Zheng
2017-10-20 6:32 ` [Qemu-devel] [PULL 5/5] docker: Fix PATH for ccache Fam Zheng
2017-10-20 12:33 ` [Qemu-devel] [PULL 0/5] Docker patches Peter Maydell
5 siblings, 0 replies; 7+ messages in thread
From: Fam Zheng @ 2017-10-20 6:32 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell
From: Greg Kurz <groug@kaod.org>
Without this patch, it fails with:
IOError: [Errno 2] No such file or directory:
'tests/docker/dockerfiles/debian-apt-fake.sh'
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <150841324224.31292.4012464539983692364.stgit@bahia.lan>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/docker/Makefile.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 02cd520590..f1a398e9fa 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -44,7 +44,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\
"BUILD","$*")
-docker-image-debian-powerpc-cross: EXTRA_FILES:=tests/docker/dockerfiles/debian-apt-fake.sh
+docker-image-debian-powerpc-cross: EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-apt-fake.sh
# Enforce dependancies for composite images
docker-image-debian: docker-image-debian9
--
2.13.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PULL 5/5] docker: Fix PATH for ccache
2017-10-20 6:32 [Qemu-devel] [PULL 0/5] Docker patches Fam Zheng
` (3 preceding siblings ...)
2017-10-20 6:32 ` [Qemu-devel] [PULL 4/5] docker: fix out-of-tree 'make docker-test-build@debian-powerpc-cross' Fam Zheng
@ 2017-10-20 6:32 ` Fam Zheng
2017-10-20 12:33 ` [Qemu-devel] [PULL 0/5] Docker patches Peter Maydell
5 siblings, 0 replies; 7+ messages in thread
From: Fam Zheng @ 2017-10-20 6:32 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell
Before bcd7f06f57fb6f780a3e2f7a46c22b6f6c8238aa we source /etc/profile
so the PATH included the right paths to ccache binaries. Now we need to
update $PATH explicitly from run script.
Keep the old /usr/lib around just so that in the future, ccache from 32
bit images will just work.
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20171018073841.30062-1-famz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/docker/run | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/docker/run b/tests/docker/run
index 642084bcb8..9dd362bb98 100755
--- a/tests/docker/run
+++ b/tests/docker/run
@@ -18,7 +18,7 @@ fi
BASE="$(dirname $(readlink -e $0))"
# Prepare the environment
-export PATH=/usr/lib/ccache:$PATH
+export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH
if test -n "$J"; then
export MAKEFLAGS="$MAKEFLAGS -j$J"
--
2.13.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PULL 0/5] Docker patches
2017-10-20 6:32 [Qemu-devel] [PULL 0/5] Docker patches Fam Zheng
` (4 preceding siblings ...)
2017-10-20 6:32 ` [Qemu-devel] [PULL 5/5] docker: Fix PATH for ccache Fam Zheng
@ 2017-10-20 12:33 ` Peter Maydell
5 siblings, 0 replies; 7+ messages in thread
From: Peter Maydell @ 2017-10-20 12:33 UTC (permalink / raw)
To: Fam Zheng; +Cc: QEMU Developers
On 20 October 2017 at 07:32, Fam Zheng <famz@redhat.com> wrote:
> The following changes since commit 063833a6ec2a6747e27c5f9866bb44c7e8de1265:
>
> Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging (2017-10-19 18:42:51 +0100)
>
> are available in the git repository at:
>
> git://github.com/famz/qemu.git tags/docker-pull-request
>
> for you to fetch changes up to 6a2e11974fa6c4eaee6b2b156b1b4e03ca983bab:
>
> docker: Fix PATH for ccache (2017-10-20 14:28:50 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 7+ messages in thread