Re: [PATCH v1 05/11] tests/docker: add docs FEATURE flag and use for test-misc

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

On 4/9/20 11:15 PM, Alex Bennée wrote:
> The test-misc docker test fails on a number of images which don't have
> the prerequisites to build the docs. Use the FEATURES flag so we can
> skip those tests.
> 
> As the sphinx test fails to detect whatever feature we need to get
> hxtool to work we drop them from debian9 so the windows build doesn't
> attempt to build the docs.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   tests/docker/dockerfiles/debian10.docker   | 2 ++
>   tests/docker/dockerfiles/debian9.docker    | 2 --
>   tests/docker/dockerfiles/fedora.docker     | 2 +-
>   tests/docker/dockerfiles/travis.docker     | 2 +-
>   tests/docker/dockerfiles/ubuntu.docker     | 2 +-
>   tests/docker/dockerfiles/ubuntu1804.docker | 2 +-
>   tests/docker/test-misc                     | 2 ++
>   7 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker
> index 2fcdc406e83..0769700a416 100644
> --- a/tests/docker/dockerfiles/debian10.docker
> +++ b/tests/docker/dockerfiles/debian10.docker
> @@ -34,3 +34,5 @@ RUN apt update && \
>           python3-sphinx \
>           texinfo \
>           $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\  -f2)
> +
> +ENV FEATURES docs
> diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerfiles/debian9.docker
> index 92edbbf0f48..08cc970feb1 100644
> --- a/tests/docker/dockerfiles/debian9.docker
> +++ b/tests/docker/dockerfiles/debian9.docker
> @@ -30,6 +30,4 @@ RUN apt update && \
>           pkg-config \
>           psmisc \
>           python3 \
> -        python3-sphinx \
> -        texinfo \
>           $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\  -f2)
> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
> index 4bd2c953af8..179575ecaaa 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -103,4 +103,4 @@ ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
>   RUN dnf install -y $PACKAGES
>   RUN rpm -q $PACKAGES | sort > /packages.txt
>   ENV PATH $PATH:/usr/libexec/python3-sphinx/
> -ENV FEATURES mingw clang pyyaml asan
> +ENV FEATURES mingw clang pyyaml asan docs
> diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker
> index e8eb48dccfd..591282561bc 100644
> --- a/tests/docker/dockerfiles/travis.docker
> +++ b/tests/docker/dockerfiles/travis.docker
> @@ -13,5 +13,5 @@ RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autoreconf g
>   # 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
> -ENV FEATURES clang pyyaml
> +ENV FEATURES clang pyyaml docs
>   USER travis
> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
> index b6c7b41dddd..eeb3b22bf20 100644
> --- a/tests/docker/dockerfiles/ubuntu.docker
> +++ b/tests/docker/dockerfiles/ubuntu.docker
> @@ -68,4 +68,4 @@ ENV PACKAGES flex bison \
>   RUN apt-get update && \
>       DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES
>   RUN dpkg -l $PACKAGES | sort > /packages.txt
> -ENV FEATURES clang pyyaml sdl2
> +ENV FEATURES clang pyyaml sdl2 docs
> diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
> index 1efedeef995..f66b06f4cff 100644
> --- a/tests/docker/dockerfiles/ubuntu1804.docker
> +++ b/tests/docker/dockerfiles/ubuntu1804.docker
> @@ -54,7 +54,7 @@ ENV PACKAGES flex bison \
>   RUN apt-get update && \
>       DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES
>   RUN dpkg -l $PACKAGES | sort > /packages.txt
> -ENV FEATURES clang pyyaml sdl2
> +ENV FEATURES clang pyyaml sdl2 docs
>   
>   # https://bugs.launchpad.net/qemu/+bug/1838763
>   ENV QEMU_CONFIGURE_OPTS --disable-libssh
> diff --git a/tests/docker/test-misc b/tests/docker/test-misc
> index d480afedca7..cc94a738dd0 100755
> --- a/tests/docker/test-misc
> +++ b/tests/docker/test-misc
> @@ -14,6 +14,8 @@
>   
>   . common.rc
>   
> +requires docs

TIL 'requires' macro. Clean fix.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> +
>   cd "$BUILD_DIR"
>   
>   # build everything else but QEMU
>