diff options
| author | Wainer dos Santos Moschetta | 2019-03-20 23:12:07 +0100 |
|---|---|---|
| committer | Alex Bennée | 2019-03-25 11:35:42 +0100 |
| commit | a6de52ac7a902c7d4fadbd95b8ccabcb7f1cf76f (patch) | |
| tree | b870de6496d28cfc751331e572a68c69c1e81a72 | |
| parent | docker: Fix travis.py parser and misc change (diff) | |
| download | qemu-a6de52ac7a902c7d4fadbd95b8ccabcb7f1cf76f.tar.gz qemu-a6de52ac7a902c7d4fadbd95b8ccabcb7f1cf76f.tar.xz qemu-a6de52ac7a902c7d4fadbd95b8ccabcb7f1cf76f.zip | |
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>
| -rwxr-xr-x | tests/docker/travis | 1 |
1 files changed, 1 insertions, 0 deletions
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 |