| Message ID | 20190320221207.11366-3-wainersm@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | make docker-travis work again | expand |
Wainer dos Santos Moschetta <wainersm@redhat.com> writes: > 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> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/travis | 1 + > 1 file changed, 1 insertion(+) > > 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 -- Alex Bennée
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
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> --- tests/docker/travis | 1 + 1 file changed, 1 insertion(+)