On 06/25/2018 08:19 AM, Alex Bennée wrote:
> Useful for debugging if nothing else as the gcovr on the Travis images
> are a little old.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/docker/dockerfiles/travis.docker | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker
> index c5ad39b533..03ebfb0ef2 100644
> --- a/tests/docker/dockerfiles/travis.docker
> +++ b/tests/docker/dockerfiles/travis.docker
> @@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8
> RUN cat /etc/apt/sources.list | sed "s/# deb-src/deb-src/" >> /etc/apt/sources.list
> RUN apt-get update
> RUN apt-get -y build-dep qemu
> -RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools
> +RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools gcovr
I suggest we follow
https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#sort-multi-line-arguments
Sort multi-line arguments:
Whenever possible, ease later changes by sorting multi-line arguments
alphanumerically. This helps to avoid duplication of packages and make
the list much easier to update. This also makes PRs a lot easier to read
and review. Adding a space before a backslash (\) helps as well.
Regardless:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> # Travis tools require PhantomJS / Neo4j / Maven accessible
> # in their PATH (QEMU build won't access them).
> ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
>