ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Fam Zheng 2017-08-17 11:57:21 +08:00
parent 5e8a7fe673
commit 05790dafef
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/docker/common.rc
View File

@ -11,9 +11,6 @@
# or (at your option) any later version. See the COPYING file in # or (at your option) any later version. See the COPYING file in
# the top-level directory. # the top-level directory.
BUILD_DIR=/var/tmp/qemu-build
mkdir $BUILD_DIR
requires() requires()
{ {
for c in $@; do for c in $@; do
@ -28,7 +25,7 @@ build_qemu()
{ {
config_opts="--enable-werror \ config_opts="--enable-werror \
${TARGET_LIST:+--target-list=${TARGET_LIST}} \ ${TARGET_LIST:+--target-list=${TARGET_LIST}} \
--prefix=$PWD/install \ --prefix=$INSTALL_DIR \
$QEMU_CONFIGURE_OPTS $EXTRA_CONFIGURE_OPTS \ $QEMU_CONFIGURE_OPTS $EXTRA_CONFIGURE_OPTS \
$@" $@"
echo "Configure options:" echo "Configure options:"

4
tests/docker/run
View File

@ -52,10 +52,12 @@ if test -n "$SHOW_ENV"; then
fi fi
export QEMU_SRC="$TEST_DIR/src" export QEMU_SRC="$TEST_DIR/src"
export BUILD_DIR="$TEST_DIR/build"
export INSTALL_DIR="$TEST_DIR/install"
cd "$QEMU_SRC/tests/docker" cd "$QEMU_SRC/tests/docker"
CMD="$QEMU_SRC/tests/docker/$@" CMD="./$@"
if test -z "$DEBUG"; then if test -z "$DEBUG"; then
exec $CMD exec $CMD