diff options
| author | Fam Zheng | 2018-07-12 03:28:28 +0200 |
|---|---|---|
| committer | Fam Zheng | 2018-08-15 04:12:35 +0200 |
| commit | 73fb4f1de3271c6407d4b110eb136805642498da (patch) | |
| tree | 31fabbeb20917c8ee69ec4854229adaaae7e47d7 /tests/docker | |
| parent | tests: Add an option for snapshot (default: off) (diff) | |
| download | qemu-73fb4f1de3271c6407d4b110eb136805642498da.tar.gz qemu-73fb4f1de3271c6407d4b110eb136805642498da.tar.xz qemu-73fb4f1de3271c6407d4b110eb136805642498da.zip | |
tests: Allow overriding archive path with SRC_ARCHIVE
In VM based tests, the source archive is created in host, we don't have
to run archive-source.sh again, as it complicates the Makefile and
scripts.
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20180712012829.20231-4-famz@redhat.com>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/Makefile.include | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 1aaa795743..d3101afecd 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -27,8 +27,11 @@ DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME) $(DOCKER_SRC_COPY): @mkdir $@ - $(call quiet-command, cd $(SRC_PATH) && scripts/archive-source.sh $@/qemu.tar, \ - "GEN", "$@/qemu.tar") + $(if $(SRC_ARCHIVE), \ + $(call quiet-command, cp "$(SRC_ARCHIVE)" $@/qemu.tar, \ + "CP", "$@/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") |