Commit 05790daf authored by Fam Zheng's avatar Fam Zheng
Browse files

tests/docker: Clean up paths 



The 'run' script already creats src, build and install directories under
$TEST_DIR, use it in common.rc.

Also the tests always run from $QEMU_SRC/tests/docker, so use a relative
$CMD string.

Message-Id: <20170817035721.11064-1-famz@redhat.com>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent 5e8a7fe6

tests/docker/common.rc

+1 −4
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ 
# or (at your option) any later version. See the COPYING file in

# the top-level directory.



BUILD_DIR=/var/tmp/qemu-build

mkdir $BUILD_DIR



requires()

{

    for c in $@; do
@@ -28,7 +25,7 @@ build_qemu() 
{

    config_opts="--enable-werror \

                 ${TARGET_LIST:+--target-list=${TARGET_LIST}} \

                 --prefix=$PWD/install \

                 --prefix=$INSTALL_DIR \

                 $QEMU_CONFIGURE_OPTS $EXTRA_CONFIGURE_OPTS \

                 $@"

    echo "Configure options:"

tests/docker/run

+3 −1
Original line number Diff line number Diff line
@@ -52,10 +52,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