From a6de52ac7a902c7d4fadbd95b8ccabcb7f1cf76f Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Wed, 20 Mar 2019 18:12:07 -0400 Subject: docker: Fix travis script unable to find source dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Message-Id: <20190320221207.11366-3-wainersm@redhat.com> Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée --- tests/docker/travis | 1 + 1 file changed, 1 insertion(+) (limited to 'tests') 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 -- cgit v1.1