[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 8/9] docker: Fix travis script unable to find source
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 8/9] docker: Fix travis script unable to find source dir |
Date: |
Mon, 25 Mar 2019 13:20:08 +0000 |
From: Wainer dos Santos Moschetta <address@hidden>
The script generated from QEMU_SRC/.travis.yml uses BUILD_DIR and
SRC_DIR path relative to the current dir, unless these variables
are exported in environment.
Since commit 05790dafef1 BUILD_DIR is exported in the runner script,
although SRC_DIR is not, so that make docker-travis fails becase
the reference to source dir is wrong. So let's unset both BUILD_DIR
and SRC_DIR before calling the script, given it is executed from
the source dir already (as in Travis).
Signed-off-by: Wainer dos Santos Moschetta <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/tests/docker/travis b/tests/docker/travis
index d345393ced..47c03677d6 100755
--- a/tests/docker/travis
+++ b/tests/docker/travis
@@ -18,4 +18,5 @@ cmdfile=/tmp/travis_cmd_list.sh
$QEMU_SRC/tests/docker/travis.py $QEMU_SRC/.travis.yml > $cmdfile
chmod +x $cmdfile
cd "$QEMU_SRC"
+unset BUILD_DIR SRC_DIR
$cmdfile
--
2.20.1
- [Qemu-devel] [PULL 0/9 for 4.0] fpu and testing fixes, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 1/9] configure: add --target-list-exclude, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 3/9] .travis.yml: --disable-user for --without-default-devices, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 2/9] .travis.yml: split some more system builds, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 4/9] .travis.yml: reduce number of targets built while disabling things, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 7/9] docker: Fix travis.py parser and misc change, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 6/9] hardfloat: fix float32/64 fused multiply-add, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 5/9] target/mips: Fix minor bug in FPU, Alex Bennée, 2019/03/25
- [Qemu-devel] [PULL 8/9] docker: Fix travis script unable to find source dir,
Alex Bennée <=
- [Qemu-devel] [PULL 9/9] docker: trivial changes to `make docker` help, Alex Bennée, 2019/03/25
- Re: [Qemu-devel] [PULL 0/9 for 4.0] fpu and testing fixes, Peter Maydell, 2019/03/25