diff options
| author | Paolo Bonzini | 2016-06-06 16:46:52 +0200 |
|---|---|---|
| committer | Fam Zheng | 2016-06-08 09:19:30 +0200 |
| commit | 34c98c54c3c8b9e988feaa15062e40b0b11b72eb (patch) | |
| tree | edd7d0e15ff2e2e274c76e291f41063de18869c4 /tests/docker/Makefile.include | |
| parent | Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-06-0... (diff) | |
| download | qemu-34c98c54c3c8b9e988feaa15062e40b0b11b72eb.tar.gz qemu-34c98c54c3c8b9e988feaa15062e40b0b11b72eb.tar.xz qemu-34c98c54c3c8b9e988feaa15062e40b0b11b72eb.zip | |
tests/docker: fix make-archive-maybe
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 <pbonzini@redhat.com>
Message-id: 1465224417-141321-2-git-send-email-pbonzini@redhat.com
Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests/docker/Makefile.include')
| -rw-r--r-- | tests/docker/Makefile.include | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 134dc6fff4..f88c0a7309 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.$$$$) |