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

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index f88c0a7309903f585bac72179d1841a90b8ebc60..c5546eed78f327df41f952ff81ce44fe74e594bb 100644 (file)
--- 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 ec3d11934bba0cd43286e708f9200e77a8d06520..ddfac05bd466dc3a8d8b00c255936a90dac752e3 100755 (executable)
--- 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