docker: Use archive-source.py

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 2bed4c0e0025f595a8a6d4014e1ac686b2d74725..0e4f1596194b4bdd1e9618ddbe8dffb4047d9153 100644 (file)
--- 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")
 

diff --git a/tests/docker/run b/tests/docker/run
index ec2541cbd9a905f028f6451fd409de4a7429ad1b..52b76e443dbb16c6a1d6baf3ef6f594d1c09e17d 100755 (executable)
--- a/tests/docker/run
+++ b/tests/docker/run
@@ -32,13 +32,7 @@ export TEST_DIR=/tmp/qemu-test
 mkdir -p $TEST_DIR/{src,build,install}
 
 # Extract the source tarballs
-tar -C $TEST_DIR/src -xzf $BASE/qemu.tgz
-for p in dtc pixman; do
-    if test -f $BASE/$p.tgz; then
-        tar -C $TEST_DIR/src/$p -xzf $BASE/$p.tgz
-        export FEATURES="$FEATURES $p"
-    fi
-done
+tar -C $TEST_DIR/src -xf $BASE/qemu.tar
 
 if test -n "$SHOW_ENV"; then
     if test -f /packages.txt; then