diff options
| author | Fam Zheng | 2017-09-05 04:12:01 +0200 |
|---|---|---|
| committer | Fam Zheng | 2017-09-22 08:51:43 +0200 |
| commit | b7f404201e45e99da23b9764dec27ce5f965cdcd (patch) | |
| tree | d3d5e1ff24921d614e1428e39ad01a7920404446 /tests/docker/Makefile.include | |
| parent | tests: Add README for vm tests (diff) | |
| download | qemu-b7f404201e45e99da23b9764dec27ce5f965cdcd.tar.gz qemu-b7f404201e45e99da23b9764dec27ce5f965cdcd.tar.xz qemu-b7f404201e45e99da23b9764dec27ce5f965cdcd.zip | |
docker: Use archive-source.py
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/Makefile.include')
| -rw-r--r-- | tests/docker/Makefile.include | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 2bed4c0e00..0e4f159619 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -17,23 +17,13 @@ DOCKER_TOOLS := travis TESTS ?= % IMAGES ?= % -# Make archive from git repo $1 to tar.gz $2 -make-archive-maybe = $(if $(wildcard $1/*), \ - $(call quiet-command, \ - (cd $1; if git diff-index --quiet HEAD -- &>/dev/null; then \ - git archive -1 HEAD --format=tar.gz; \ - else \ - git archive -1 $$(git stash create) --format=tar.gz; \ - fi) > $2, \ - "ARCHIVE","$(notdir $2)")) - CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) DOCKER_SRC_COPY := docker-src.$(CUR_TIME) $(DOCKER_SRC_COPY): @mkdir $@ - $(call make-archive-maybe, $(SRC_PATH), $@/qemu.tgz) - $(call make-archive-maybe, $(SRC_PATH)/dtc, $@/dtc.tgz) + $(call quiet-command, $(SRC_PATH)/scripts/archive-source.sh $@/qemu.tar, \ + "GEN", "$@/qemu.tar") $(call quiet-command, cp $(SRC_PATH)/tests/docker/run $@/run, \ "COPY","RUNNER") |