[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/38] tests/docker: Clean up paths
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 07/38] tests/docker: Clean up paths |
Date: |
Fri, 8 Sep 2017 17:54:35 +0800 |
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: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
tests/docker/common.rc | 5 +----
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
--
2.13.5
- [Qemu-devel] [PULL 00/38] Test and build system patches, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 02/38] docker: docker.py make --no-cache skip checksum test, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 03/38] docker: don't install device-tree-compiler build-deps in travis.docker, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 01/38] docker: ensure NOUSER for travis images, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 04/38] docker: reduce noise when building travis.docker, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 05/38] docker: Update ubuntu image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 06/38] docker: Enable features explicitly in test-full, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 08/38] gitignore: Ignore vm test images, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 07/38] tests/docker: Clean up paths,
Fam Zheng <=
- [Qemu-devel] [PULL 09/38] qemu.py: Add "wait()" method, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 10/38] scripts: Add archive-source.sh, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 11/38] tests: Add vm test lib, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 12/38] tests: Add ubuntu.i386 image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 13/38] tests: Add FreeBSD image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 14/38] tests: Add NetBSD image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 15/38] tests: Add OpenBSD image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 16/38] Makefile: Add rules to run vm tests, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 17/38] MAINTAINERS: Add tests/vm entry, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 18/38] tests: Add README for vm tests, Fam Zheng, 2017/09/08