diff options
| author | Alex Bennée | 2020-04-14 22:06:20 +0200 |
|---|---|---|
| committer | Alex Bennée | 2020-04-15 12:38:23 +0200 |
| commit | 551affb61ecdaf54a24f6d8fa931cfc6e8157500 (patch) | |
| tree | da0c3b71f636891ebd2101e99a5ed42b0430c68f /tests/docker/dockerfiles/ubuntu1804.docker | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| download | qemu-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/ubuntu1804.docker')
| -rw-r--r-- | tests/docker/dockerfiles/ubuntu1804.docker | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 1efedeef99..f66b06f4cf 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 |