diff options
| author | Fam Zheng <famz@redhat.com> | 2017-08-17 11:57:21 +0800 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2017-09-22 10:20:34 +0800 |
| commit | 05790dafef187ae1739d71dbd15a3baea2b8f8b1 (patch) | |
| tree | fe93af8f3862075e6734ccd70344efe59224a4f5 /tests/docker | |
| parent | 5e8a7fe673ca5949bd51939ee36faaf3b1320de8 (diff) | |
| download | qemu-05790dafef187ae1739d71dbd15a3baea2b8f8b1.tar.gz | |
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: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests/docker')
| -rwxr-xr-x | tests/docker/common.rc | 5 | ||||
| -rwxr-xr-x | tests/docker/run | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 6865689bb5..64b36ba2d0 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -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:" diff --git a/tests/docker/run b/tests/docker/run index c1e4513bce..ec2541cbd9 100755 --- a/tests/docker/run +++ b/tests/docker/run @@ -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 |