[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/17] tests: Allow overriding archive path with SRC_
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 09/17] tests: Allow overriding archive path with SRC_ARCHIVE |
Date: |
Wed, 15 Aug 2018 11:12:40 +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>
Message-Id: <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
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 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")
--
2.17.1
- [Qemu-devel] [PULL 00/17] Block and testing patches, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 01/17] tests/vm: Only use -cpu 'host' if KVM is available, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 02/17] tests/vm: Add flex and bison to the vm image, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 05/17] aio-posix: Don't count ctx->notifier as progress when polling, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 04/17] nvme: simplify plug/unplug, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 03/17] nvme: Fix nvme_init error handling, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 06/17] aio: Do aio_notify_accept only during blocking aio_poll, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 09/17] tests: Allow overriding archive path with SRC_ARCHIVE,
Fam Zheng <=
- [Qemu-devel] [PULL 10/17] tests: Add centos VM testing, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 08/17] tests: Add an option for snapshot (default: off), Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 13/17] tests/vm: Propagate V=1 down into the make inside the VM, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 11/17] tests: vm: Add vm-clean-all, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 12/17] tests/vm: Pass the jobs parallelism setting to 'make check', Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 07/17] docker: Install more packages in centos7, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 14/17] tests/vm: Bump guest RAM up from 2G to 4G, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 15/17] tests/vm: Use make's --output-sync option, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 17/17] aio-posix: Improve comment around marking node deleted, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 16/17] tests/vm: Add vm-build-all/vm-clean-all in help text, Fam Zheng, 2018/08/14