OSDN Git Service

tests: Allow overriding archive path with SRC_ARCHIVE
authorFam Zheng <famz@redhat.com>
Thu, 12 Jul 2018 01:28:28 +0000 (09:28 +0800)
committerFam Zheng <famz@redhat.com>
Wed, 15 Aug 2018 02:12:35 +0000 (10:12 +0800)
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>
tests/docker/Makefile.include

index 1aaa795..d3101af 100644 (file)
@@ -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")