qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH v2 3/4] tests: Allow overriding archive path with SR


From: Fam Zheng
Subject: [Qemu-devel] [PATCH v2 3/4] tests: Allow overriding archive path with SRC_ARCHIVE
Date: Wed, 11 Jul 2018 22:18:28 +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 <address@hidden>
---
 tests/docker/Makefile.include | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index b2a7e761cc..f0525b91a7 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")
 
-- 
2.17.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]