aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorWainer dos Santos Moschetta <wainersm@redhat.com>2019-03-20 18:12:07 -0400
committerAlex Bennée <alex.bennee@linaro.org>2019-03-25 10:35:42 +0000
commita6de52ac7a902c7d4fadbd95b8ccabcb7f1cf76f (patch)
treeb870de6496d28cfc751331e572a68c69c1e81a72 /tests
parente8ced6813ded537f002ce93833ddf6eadd3e6bf6 (diff)
downloadqemu-a6de52ac7a902c7d4fadbd95b8ccabcb7f1cf76f.zip
qemu-a6de52ac7a902c7d4fadbd95b8ccabcb7f1cf76f.tar.gz
qemu-a6de52ac7a902c7d4fadbd95b8ccabcb7f1cf76f.tar.bz2
docker: Fix travis script unable to find source dir
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 <wainersm@redhat.com> Message-Id: <20190320221207.11366-3-wainersm@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/docker/travis1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/docker/travis b/tests/docker/travis
index d345393..47c0367 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