aboutsummaryrefslogtreecommitdiff
path: root/tests/docker
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2017-10-18 15:06:29 +0200
committerFam Zheng <famz@redhat.com>2017-10-20 14:28:50 +0800
commitbc739b8e7d02c8010a5ab0a5f4d6ed99c1bb1d37 (patch)
tree8faee8e9dc2e0af24b809b78a67a0c936ff1e1af /tests/docker
parent08c3f6d57f9a95036eed1eea0571eb47605aaef4 (diff)
downloadqemu-bc739b8e7d02c8010a5ab0a5f4d6ed99c1bb1d37.zip
qemu-bc739b8e7d02c8010a5ab0a5f4d6ed99c1bb1d37.tar.gz
qemu-bc739b8e7d02c8010a5ab0a5f4d6ed99c1bb1d37.tar.bz2
docker: allow running from srcdir != builddir build
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>
Diffstat (limited to 'tests/docker')
-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 38874ec..02cd520 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")