summaryrefslogtreecommitdiffstats
path: root/tests/docker/dockerfiles/fedora.docker
diff options
context:
space:
mode:
authorAlex Bennée2020-04-14 22:06:20 +0200
committerAlex Bennée2020-04-15 12:38:23 +0200
commit551affb61ecdaf54a24f6d8fa931cfc6e8157500 (patch)
treeda0c3b71f636891ebd2101e99a5ed42b0430c68f /tests/docker/dockerfiles/fedora.docker
parentMerge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff)
downloadqemu-551affb61ecdaf54a24f6d8fa931cfc6e8157500.tar.gz
qemu-551affb61ecdaf54a24f6d8fa931cfc6e8157500.tar.xz
qemu-551affb61ecdaf54a24f6d8fa931cfc6e8157500.zip
tests/docker: add docs FEATURE flag and use for test-misc
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> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200414200631.12799-7-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/dockerfiles/fedora.docker')
-rw-r--r--tests/docker/dockerfiles/fedora.docker2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 4bd2c953af..179575ecaa 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