From patchwork Wed Apr 15 10:42:04 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: 185470 Delivered-To: patch@linaro.org Received: by 2002:a50:3f90:0:0:0:0:0 with SMTP id e16csp295095ecu; Wed, 15 Apr 2020 03:43:12 -0700 (PDT) X-Google-Smtp-Source: APiQypKC/ovIJvBQnQfnMLofcw5L6kByUTViR7YdAzT8wnh5NFb1/86tUAB5okt5MvXXmrgPUAkF X-Received: by 2002:a37:98d:: with SMTP id 135mr13274750qkj.377.1586947392002; Wed, 15 Apr 2020 03:43:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586947391; cv=none; d=google.com; s=arc-20160816; b=Sg0E8P3kbqfAj8NTnU+Ni42q1vPONDK9MtEfkEIUHYsIR57l5WUx0ZXEsEp5znCvd/ yQgrsIuIlRFPnKBErntsdK1JMEV4T6UbGuUwS34AXSEUKsqOzfTv8ssIx1wKKn8AW6E+ OApcqk2GWXtHvIgrmeYKB62inOrf4/jw3DUuc5pqVExM3+dHCfE/JD76iWU6+BihZrKI UVESP+i7LYQtZUiqbgugwZdl341XDmOTKvK90gvPxqaQyfFHGwH+JzfR2t4U2yk46fH8 Bz7ZD6v/OcYc4Vji02QZE9HlNZmtKxZhBokR+JjhVID9rciZssEnW21EJFfMDM8vkXUT y4yw== 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=gqClmpUMRQ7554ONdma89yQHiMPp+cgh6LGRH7uysgg=; b=dtxWMqXSJCbxFCvyxlaPhwm5OHRWCasQvGn2gOli+e1+nJSugo8b/7TDes82aD6ZjG Aj56JqRh3tMyh/kcSkl2jbyEK6NRpNQSNGlGJrmo+ZuuyajZnDFPEvR2ADTlpLjASmVe UbiY4ZWfahgbfz2A+rHkycJDzj09nAjIIXuoOfKhoyKZnSrUXXMoudpEviPWQObJWqrx hGFNF35BAzh/lpxDWjszWEgVadFthPUkY+k09Xg/1scpFLHnlBO7m9SuGTtjmRc7dbFF Stw1m96t21ag8mxeHUmEf62reAnFKvBMYBCMUsMPnwbwZDe+zwsflg8MaoFcWY0xVVsc EXpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=s5XowzuA; 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 q33si9460509qtd.160.2020.04.15.03.43.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Apr 2020 03:43:11 -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=s5XowzuA; 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]:47580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfVf-0002Dp-CF for patch@linaro.org; Wed, 15 Apr 2020 06:43:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45466) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOfUp-00028n-26 for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOfUn-00036y-Bw for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:18 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:34824) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOfUn-00036b-5p for qemu-devel@nongnu.org; Wed, 15 Apr 2020 06:42:17 -0400 Received: by mail-wm1-x335.google.com with SMTP id r26so18433677wmh.0 for ; Wed, 15 Apr 2020 03:42:17 -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=gqClmpUMRQ7554ONdma89yQHiMPp+cgh6LGRH7uysgg=; b=s5XowzuA9uoF1wZOsE5UuWL3tQeKsX4fPJC9yjLfPaWkFNcUVSpoCXi7D/h//hQagf u22Vh3qJjU4h/+SagQsF3E/4j4PIzGBUg9OjKOgtuXn7wdANl/jb2TVfal5KPM1t09Fm 18e6FDbh9/0V2Q9p3Q0ejZ54e0rmSH/FoMZ5aecKBBunp7nCYiQmeq8+1N4BSE87SbEW unLvaVfVDlz7lXV125XvNwWcuQ10oxRXbYlaHYEwqFnGJzc+Tmg4AxvGWxe3jGxhEpet azBTWRUJ9aqFLcJtyrgd6l1ndlIL63erm4AjrkZNQ+/BLrTh1NTxEO/CMX8U/IiiAGrY pdaA== 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=gqClmpUMRQ7554ONdma89yQHiMPp+cgh6LGRH7uysgg=; b=MCU/NyR8JS2NCTWiY3xxE9DMqh5FBuQ2m4E3DUp+2+fT6ANAIDVKRttJqCtYUIIp6h 0P/CFIBawTF8bCtkzTFDgnb1mMy47oAoB99sJi/intaeWoMjFp33+ZvONsUhw/Htec73 xuLHTA2ZzxyWLq5lBQyS2JV5DaLck/003KUB5OYMDa3DUu7GeiF+0wQIXLnvzoNZXwPz HT52AW74WUfSVBrz+hkKguZCJxSpGErTQ6EYUABgJmPYz9YBtKvhwGdrAjBjkPYXwMOp xGKmiufTkkMALX4gaNKOy55kujz6p4FrGxsPjzwsfHuOlTGoF03ThuMlgEj6tiMbpxad ZqtQ== X-Gm-Message-State: AGi0PuYz9rme9kt+zIyNQF6IQRustAxAwot5okNg40VjNSE3wwYjjfBv 8lOyxK+yVvB8aH7GPlbnaQ6c34aPBlc= X-Received: by 2002:a1c:bd54:: with SMTP id n81mr4408252wmf.141.1586947336151; Wed, 15 Apr 2020 03:42:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h2sm22870154wmf.34.2020.04.15.03.42.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 03:42:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 165781FF87; Wed, 15 Apr 2020 11:42:12 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 1/8] tests/docker: add docs FEATURE flag and use for test-misc Date: Wed, 15 Apr 2020 11:42:04 +0100 Message-Id: <20200415104211.9388-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415104211.9388-1-alex.bennee@linaro.org> References: <20200415104211.9388-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::335 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?= , qemu-devel@nongnu.org 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 Message-Id: <20200414200631.12799-7-alex.bennee@linaro.org> -- 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