Commit bc739b8e authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Fam Zheng
Browse files

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: b7f40420
Cc: Fam Zheng <famz@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>

Message-Id: <1508331989-142364-1-git-send-email-pbonzini@redhat.com>
Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent 08c3f6d5

tests/docker/Makefile.include

+2 −2
Original line number Diff line number Diff line
@@ -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")