mirror of https://gitee.com/openkylin/qemu.git
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>
This commit is contained in:
parent
2f7cc1fbd6
commit
551affb61e
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -14,6 +14,8 @@
|
|||
|
||||
. common.rc
|
||||
|
||||
requires docs
|
||||
|
||||
cd "$BUILD_DIR"
|
||||
|
||||
# build everything else but QEMU
|
||||
|
|
Loading…
Reference in New Issue