From patchwork Thu Apr 9 21:15:23 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: 185325 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp2321871ilr; Thu, 9 Apr 2020 14:18:59 -0700 (PDT) X-Google-Smtp-Source: APiQypLTYVG1ssZL/oloSAWayMAscu3fEYyOfdvcrNBKPPSXrKZQUeI1d7Qq4ZurrvxjGpjLGoh7 X-Received: by 2002:a37:4ac2:: with SMTP id x185mr905665qka.413.1586467139813; Thu, 09 Apr 2020 14:18:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586467139; cv=none; d=google.com; s=arc-20160816; b=KL3tvWgweY/1Cs6JAfa72cFoO/0vhUlGWGhlBvaOXYeS7brfiGxDZTUm4d5qSrDVyw IZxVfxPufbic6bsVHNolFR3yPWYH18QVVQD97PDhQj6IklP6HSfLY0wCiR3iiBjIrX7/ /2+/gCTzylR9WSvSm01RL9LcLD/bPEcygpclDjxHK5BNWY29uR8GPcBVFTE/+GUngCQr xOt8miVdTu3syKmT4yVHFm7bkZHir5ijY6ib2T0Y2rxFGAGyN0DeGtXowRTpY1U+cEUd QvpO/uWyOqOwePglmfZf7kYIE1S30x/IUXS5f7xIUI7uUwTvSGTaBUofSpo0WxIpbXL7 Yx0A== 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=8kQXViYqUTZuPa2IrzFhn8UbNVNyk6FZ2Gjm7NSMqNs=; b=HDrulGUrHHQwaisj26t4WgvcljrPoHkUR5ozCTlCV6Lf2hw+3I6SdfnEEr22GlfLH9 EL5XUyt4XIp7oMwGSdT9RADDn2Dr3rAnumCv3CyfPWzRHQ9siSteIEfF7y/U1FglwyWq I7Plg6xfbR6pQvvRoiE9buaDwlBS7E/ZAmMerU7g+f1VagHoHFFYSPCwFNwqV0Sdlth5 a0mce2hmaCvEPQrOyKmA0K7yI+LkHN0CGmzhNenr7kSolpSq7plHbgch1UkLkDIsYoBe PyHNu1jrypOl6y+ZaVir4RukxAGNRfExtdQb32nWNu/mV9B/wgIBDioDOvicy6uujiIZ 0XAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="Nus5r/PB"; 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 h1si123625qkc.288.2020.04.09.14.18.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Apr 2020 14:18:59 -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="Nus5r/PB"; 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]:55624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMeZf-0005ot-Af for patch@linaro.org; Thu, 09 Apr 2020 17:18:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42336) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jMeWS-000252-Op for qemu-devel@nongnu.org; Thu, 09 Apr 2020 17:15:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jMeWR-0005gi-8S for qemu-devel@nongnu.org; Thu, 09 Apr 2020 17:15:40 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:50675) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jMeWR-0005g3-2J for qemu-devel@nongnu.org; Thu, 09 Apr 2020 17:15:39 -0400 Received: by mail-wm1-x32e.google.com with SMTP id x25so294470wmc.0 for ; Thu, 09 Apr 2020 14:15:39 -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=8kQXViYqUTZuPa2IrzFhn8UbNVNyk6FZ2Gjm7NSMqNs=; b=Nus5r/PBUtysXeNOzCbziBtjB2uborn+ThW7eupuqD/2pQJvPDsYIKnWlJnDVRBxaE sglav2nIVP9iwmP96Znw1zBwDaUTWM6+c20xnmRj9BGIsnIAszo06Tf+qrCGR028z6Ma mwCGOIFuhLzhx22Q5Gyz7tZs/sj8FO5MzcFMWnAoAyrZSkDtLWn/C81tQbGPeu7hyTrX NNFYWTZsARklMZDgZFBuENY2j7kVBhzJAbJWpI9NkKTJONaDjZWfAGb+Jg2VpvbkI5OB i9i1c6zRPoZwn0qLc6gL+xOa7Ya8WED3sbIfjW/ya9NoUQ5jzoYA3RNl00NkZhYmdR3y gvCg== 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=8kQXViYqUTZuPa2IrzFhn8UbNVNyk6FZ2Gjm7NSMqNs=; b=hmNDHPjRWqt3w7tjywpoQ+cLVXvnMU4OlMdVL6HxwmY7rprMFZx//xB3/jJpLtCEqZ I++OulBuC2Vpk8gVkAZ+gYJHUfMVWU7y3wdPsujZgu/FrSD43wOAjzUaLsEkxLn3nRj5 ULTe9D1ijscw3QfB1P9uLnwG+00wCjujxbcPw0EzUsfihFQhj4OCIRPhOxIbiq54/6qM oTIqh8oxZPX5/B5g8irB5bKX05gogyeU5CYbcuCNBJ+D6/zIIlzvjuKO25BDMsuAi2vs 87F3IXxdo/A044ciD97hbJRJm9irv7U4iUKpbtbUG2NkUmYuTJ9+VRiVR86osi1XqPPY 01ew== X-Gm-Message-State: AGi0PuY8b7D+xIWaXnvRc66mp90kHlDUv/vH6rOA9qb1FOiZaOuu95MB jMXwSMknBUEoGP+C7wN7rHq3oA== X-Received: by 2002:a1c:9c47:: with SMTP id f68mr1709909wme.148.1586466937998; Thu, 09 Apr 2020 14:15:37 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j10sm24038122wru.85.2020.04.09.14.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2020 14:15:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 830BE1FF91; Thu, 9 Apr 2020 22:15:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/11] tests/docker: add docs FEATURE flag and use for test-misc Date: Thu, 9 Apr 2020 22:15:23 +0100 Message-Id: <20200409211529.5269-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200409211529.5269-1-alex.bennee@linaro.org> References: <20200409211529.5269-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::32e 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?= , =?utf-8?q?Alex_Benn=C3=A9e?= 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 --- 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson 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