diff options
| author | Fam Zheng <famz@redhat.com> | 2016-07-19 21:20:41 +0800 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2016-07-20 19:19:43 +0800 |
| commit | c81585130e7480a8ad9fcdbc3ff712c48260cf43 (patch) | |
| tree | 7b883528ebc3d2c07a1ff02d14991a7eb51226cf | |
| parent | 6e733da676a5483314d86f1bcb14950a165b0e6f (diff) | |
docker: More sensible run script
It is very easy to figure out current directory and bash option from the
execution, so do less in the Makefile invocation command line, and
figure both options in the script.
This makes the next patch easier.
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-id: 1468934445-32183-7-git-send-email-famz@redhat.com
| -rw-r--r-- | tests/docker/Makefile.include | 4 | ||||
| -rwxr-xr-x | tests/docker/run | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index f88c0a7309..c5546eed78 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -114,10 +114,8 @@ docker-run-%: docker-qemu-src -e CCACHE_DIR=/var/tmp/ccache \ -v $$(realpath $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \ -v $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \ - -w /var/tmp/qemu \ qemu:$(IMAGE) \ - $(if $V,/bin/bash -x ,) \ - ./run \ + /var/tmp/qemu/run \ $(CMD); \ , " RUN $(CMD) in $(IMAGE)"))) diff --git a/tests/docker/run b/tests/docker/run index ec3d11934b..ddfac05bd4 100755 --- a/tests/docker/run +++ b/tests/docker/run @@ -11,6 +11,12 @@ # or (at your option) any later version. See the COPYING file in # the top-level directory. +if test -n "$V"; then + set -x +fi + +BASE="$(dirname $(readlink -e $0))" + # Prepare the environment . /etc/profile || true export PATH=/usr/lib/ccache:$PATH @@ -24,10 +30,10 @@ export TEST_DIR=/tmp/qemu-test mkdir -p $TEST_DIR/{src,build,install} # Extract the source tarballs -tar -C $TEST_DIR/src -xzf qemu.tgz +tar -C $TEST_DIR/src -xzf $BASE/qemu.tgz for p in dtc pixman; do - if test -f $p.tgz; then - tar -C $TEST_DIR/src/$p -xzf $p.tgz + if test -f $BASE/$p.tgz; then + tar -C $TEST_DIR/src/$p -xzf $BASE/$p.tgz export FEATURES="$FEATURES $p" fi done |