From patchwork Tue Apr 14 20:06:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 185446 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp1835618ilf; Tue, 14 Apr 2020 13:11:40 -0700 (PDT) X-Google-Smtp-Source: APiQypKwB40VT4uo+Zk9NeYb6VctJx4sYWc3LSxKBl1aluKHeLtRNo5L6dUzQqS7s/MzN2A+UF1M X-Received: by 2002:a37:61cf:: with SMTP id v198mr21658561qkb.485.1586895100038; Tue, 14 Apr 2020 13:11:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586895100; cv=none; d=google.com; s=arc-20160816; b=PGhlmdLESHdlpiZnK+nm9CD/RhBLgRZCAaVwKTKGzrubWe9aCz4NaxxBuPaJbUuqzB EisoXc09p7MzMUz3qx8v8QxR1bB/DkP5hHxNC33zbRQHTdQSgIpQ/+faubpKsTXNiGJB /xEiWI82gvIqmsxPWeTmMji4OmKOx54iZkBP4mygLwEmLCkVaCsHKyNXqi4WXn1MZQss y6xA6bP0dR8cHCJlnF8z1WWxIFevq8YSBmjVQz93VcTipUjE1kGvPuZNmdhOTjACNPE7 oCdBqgXOIkFvgImRW4IHAjzQaZWtLEqUJ1OJa1rqan6jLnpv/JYMZpDIHUDVSvTf92vY BRfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=MKNqRiBPCPZs1Nb8xQ+iMkO9ECJezVjcKyg7f8B8t6U=; b=P2BsNuUfxR+V20RD01EEFY7kRPYRDkf4AKhdT117sxrIImn71FYxWyUOhyWBbHtWPK ZR66/oSRCsAKfbEBQRwm/C6/R4LmyEN93NitjgFPvdUhZvRezmtx6RkpaVvaSZdBssvx UbtiMknexVTmWxfb9YssqefL0zVifpm/8bZNEAwC5vXFVfc5L323urJTSSsiTtsgL+YV 8TKXh0q8gdprQOWrD2eJlWKNcscrPvC8WuVrp75bwEL4V8DjLBrmhK2U+hYwnwxtn0ca 0+6db0qVlXUlWTPeRQZVHIg3Ykk6xG7yWBotCKnVz31kN20Siy6sTbI9CJJKE2mvpLUZ LZAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="l5x/H0Fz"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w70si8981102qkb.180.2020.04.14.13.11.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Apr 2020 13:11:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="l5x/H0Fz"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jORuF-0006zC-Js for patch@linaro.org; Tue, 14 Apr 2020 16:11:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44478) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jORpT-0005zL-QN for qemu-devel@nongnu.org; Tue, 14 Apr 2020 16:06:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jORpS-0005w7-8Z for qemu-devel@nongnu.org; Tue, 14 Apr 2020 16:06:43 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:50380) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jORpS-0005vX-23 for qemu-devel@nongnu.org; Tue, 14 Apr 2020 16:06:42 -0400 Received: by mail-wm1-x330.google.com with SMTP id x25so14524468wmc.0 for ; Tue, 14 Apr 2020 13:06:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MKNqRiBPCPZs1Nb8xQ+iMkO9ECJezVjcKyg7f8B8t6U=; b=l5x/H0FzNGEL47GRnzCGTQS6UHX8GrWNGh8RgaP/OSqthAsQt7FUL+Hfr1dMv6rWEO EZ6+Zc/5uKFNU6G9VKyq7C8cFPZ8SWm8jkjAqU8wLI+/JR02HjKCjLqFN1avOR/W+dAa S3gh/De7w+cjua5rPeZloCg0DrNKMKjTnuUStGSaQJTqOuM+e8W4hx7NvHJ9wAnyCXBu Bm2aZgY16Kz1RcCv2QTbsDTYt8jvz6szJmH1DjfdlxWLDvOfvcPVtmr+nJunHvDZz+Iq ydEEZFe2DjuSsRq2K8cnzdx0EK5gAa0MwggbZRSTT59Jor6eUbK/A6tYu8h7Ph1dF9Zm 0sNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MKNqRiBPCPZs1Nb8xQ+iMkO9ECJezVjcKyg7f8B8t6U=; b=TAQumhpec74LCIGG2g4AWKX9B+dFBzcW8du7CDjRUToJubtPVxB60bhP4h6wvVG2JJ A4H1BU58GhBP56STc+CDdAB3p9W2Q+GI6avZxTUq5ibj/BtnsrzQ6MWOvHZK/KQuTmBo nOAL+sRkaG10cRxRMVPWf8+VNyi8dPd+CFMrrLApcRK+rH+URnGK+JB7ZoXGPr07xGkC FSW8oh5LgYDprQP4h+rQNPGgOrZLjY1aJdrBD/F677LOkdCj9hJwTuZsosfU4rkTeVor 5+bFdudDlp9APEiP23K14VywEPX5sr2tvWo517I0kmZdKqsna8/ocB2jF/2Jct5KVmyi fFQg== X-Gm-Message-State: AGi0PubNMiYbuohRkz5AYUShKXE3MjJ36g3j4QiqKaXugr7TQNf0Tq2K 8pJW69oaG7v9iy+TTfDHf0pUYlVHlGg= X-Received: by 2002:a1c:e242:: with SMTP id z63mr1586134wmg.72.1586894800990; Tue, 14 Apr 2020 13:06:40 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q8sm19482844wmg.22.2020.04.14.13.06.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 13:06:36 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 85FC81FF92; Tue, 14 Apr 2020 21:06:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/17] tests/docker: add docs FEATURE flag and use for test-misc Date: Tue, 14 Apr 2020 21:06:20 +0100 Message-Id: <20200414200631.12799-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414200631.12799-1-alex.bennee@linaro.org> References: <20200414200631.12799-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- 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(-) -- 2.20.1 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 + cd "$BUILD_DIR" # build everything else but QEMU