[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/6] tests/docker: fix make-archive-maybe
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH 1/6] tests/docker: fix make-archive-maybe |
Date: |
Tue, 7 Jun 2016 10:41:30 +0800 |
User-agent: |
Mutt/1.6.1 (2016-04-27) |
On Mon, 06/06 16:46, Paolo Bonzini wrote:
> make-archive-maybe expects an archive path relative
> to $1, but receives a path relative to the current directory. Redirect
> the output outside the subshell to bypass the "cd $1".
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> tests/docker/Makefile.include | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 2fd2ca3..d0ad36c 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -21,10 +21,10 @@ IMAGES ?= %
> make-archive-maybe = $(if $(wildcard $1/*), \
> $(call quiet-command, \
> (cd $1; if git diff-index --quiet HEAD -- &>/dev/null; then \
> - git archive -1 HEAD --format=tar.gz -o $2; \
> + git archive -1 HEAD --format=tar.gz; \
> else \
> - git archive -1 $$(git stash create) --format=tar.gz -o
> $2; \
> - fi), \
> + git archive -1 $$(git stash create) --format=tar.gz; \
> + fi) > $2, \
> " ARCHIVE $(notdir $2)"))
>
> CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)
> --
> 1.8.3.1
>
>
I think this is better than my patch because it also reduces the duplication
between the two "git archive" commands a little. So I'm dropping mine.
Fam
- [Qemu-devel] [PATCH 0/6] Small tests/docker fixes, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PATCH 6/6] tests/docker: build all targets in test-clang, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PATCH 3/6] tests/docker: fix test-mingw, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PATCH 5/6] tests/docker: support travis test with fedora image, Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PATCH 1/6] tests/docker: fix make-archive-maybe, Paolo Bonzini, 2016/06/06
- Re: [Qemu-devel] [PATCH 1/6] tests/docker: fix make-archive-maybe,
Fam Zheng <=
- [Qemu-devel] [PATCH 4/6] tests/docker: remove unused feature "ccache", Paolo Bonzini, 2016/06/06
- [Qemu-devel] [PATCH 2/6] tests/docker: make test-full build all targets, not none, Paolo Bonzini, 2016/06/06
- Re: [Qemu-devel] [PATCH 0/6] Small tests/docker fixes, Fam Zheng, 2016/06/06