From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMRmB-0003UR-9W for qemu-devel@nongnu.org; Sun, 10 Jul 2016 23:20:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMRm8-0002um-3g for qemu-devel@nongnu.org; Sun, 10 Jul 2016 23:20:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMRm7-0002ui-UB for qemu-devel@nongnu.org; Sun, 10 Jul 2016 23:20:52 -0400 From: Fam Zheng Date: Mon, 11 Jul 2016 11:20:39 +0800 Message-Id: <1468207242-5015-2-git-send-email-famz@redhat.com> In-Reply-To: <1468207242-5015-1-git-send-email-famz@redhat.com> References: <1468207242-5015-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH RFC v4 1/4] docker: More sensible run script List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org 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 --- tests/docker/Makefile.include | 4 +--- tests/docker/run | 12 +++++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index f88c0a7..c5546ee 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 ec3d119..575e732 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 $(realpath $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 -- 2.7.4