Re: [Qemu-devel] [PATCH v8 13/13] docker: Use archive-source.py

[Alex Bennée]

Fam Zheng <address@hidden> writes:

> Signed-off-by: Fam Zheng <address@hidden>

Reviewed-by: Alex Bennée <address@hidden>

> ---
>  tests/docker/Makefile.include | 15 ++-------------
>  tests/docker/run              |  8 +-------
>  2 files changed, 3 insertions(+), 20 deletions(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index aaab1a4208..7a027d5bd6 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -17,24 +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 make-archive-maybe, $(SRC_PATH)/pixman, $@/pixman.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 c1e4513bce..9eb9165f76 100755
> --- 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


--
Alex Bennée