diff options
Diffstat (limited to 'tests/docker/run')
| -rwxr-xr-x | tests/docker/run | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/tests/docker/run b/tests/docker/run index c1e4513bce..c8f940de15 100755 --- a/tests/docker/run +++ b/tests/docker/run @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # # Docker test runner # @@ -11,8 +11,6 @@ # or (at your option) any later version. See the COPYING file in # the top-level directory. -set -e - if test -n "$V"; then set -x fi @@ -20,7 +18,7 @@ fi BASE="$(dirname $(readlink -e $0))" # Prepare the environment -. /etc/profile || true +. /etc/profile export PATH=/usr/lib/ccache:$PATH if test -n "$J"; then @@ -32,13 +30,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 || prep_fail "Failed to untar source" if test -n "$SHOW_ENV"; then if test -f /packages.txt; then @@ -52,10 +44,12 @@ if test -n "$SHOW_ENV"; then fi export QEMU_SRC="$TEST_DIR/src" +export BUILD_DIR="$TEST_DIR/build" +export INSTALL_DIR="$TEST_DIR/install" cd "$QEMU_SRC/tests/docker" -CMD="$QEMU_SRC/tests/docker/$@" +CMD="./$@" if test -z "$DEBUG"; then exec $CMD |