From nobody Fri Nov 14 00:57:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583769963; cv=none; d=zohomail.com; s=zohoarc; b=EdvtAvTElgfccOoW4upJNSShn8LJIejsmrag4AYceBWWwvZf6fTSZcEuu/qDGQUBRD6JjEFsSF3G4z4CtpKL3Iz2a/ZEn8mEcUVu10TZgv3XxyTUQM/AnpX9BjIkpbMGO1FY7HRT/zgaopCyGE1DjKQwIsOqSKs/Lg2NgCDTn9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583769963; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nWSMAlzi0oMRfWAEf8TA2pk4lWoUJVNUT6Q1IhJAJTw=; b=GmnFZwPuv7y+RaBA54v8aN4TvUYV5yq/iOpNoLwbbl7VjlOdnsok751h6b4h39gGZX1xDa08hwERxDiDhV/Vrc8S4IG0jcbP+TFz8LZUQH9eC2TsU8+eFAM0PgNSLVNeSxB3T+YCZQBAzeaHnTqeXtdn08bA+KzTWiPca2Zh160= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583769963243381.7419558902948; Mon, 9 Mar 2020 09:06:03 -0700 (PDT) Received: from localhost ([::1]:46100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBKuo-0000dB-2r for importer@patchew.org; Mon, 09 Mar 2020 12:06:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40332) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBKZm-0001qD-05 for qemu-devel@nongnu.org; Mon, 09 Mar 2020 11:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBKZj-0001MY-V5 for qemu-devel@nongnu.org; Mon, 09 Mar 2020 11:44:17 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:44462) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBKZi-0001LV-DP for qemu-devel@nongnu.org; Mon, 09 Mar 2020 11:44:15 -0400 Received: by mail-wr1-x42b.google.com with SMTP id l18so1741016wru.11 for ; Mon, 09 Mar 2020 08:44:14 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id d63sm25932166wmd.44.2020.03.09.08.44.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2020 08:44:12 -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=nWSMAlzi0oMRfWAEf8TA2pk4lWoUJVNUT6Q1IhJAJTw=; b=pQXkB1kMbN2sUFn1XurCnvTAozVEaogD8qp5qN7ePBOwmWb5VuQ87UjKNOpp0vb9Cx +SIvab09lKqIUM5UwLcZbMJU5EmDAu+/A1OANgMK1Ys52uSNgOl1cH6h5nf0IAlsM7wF mDHOOhoqZ60U2tNVSxXVaNK86Y3eaAnk2RlVr03DUmLKUgFqhYDnqLqS93cGnqP/HnU4 uAbDf3cwLlOVpC8ZsHjdi7EeZuLQCx5GjYLcBFSkD4o7IxtgyV69yTuNBBXdQEnGBRLi tR8qOL/rwLYPtUbuYPEeijrjvjp/UCcf4oo26iIbOsT3XdzAdnzkremtwgJiyd/MKzjB UqSw== 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=nWSMAlzi0oMRfWAEf8TA2pk4lWoUJVNUT6Q1IhJAJTw=; b=mU5oEurZ/N4/L9BN4PwXkjJLvdIlwVwfcJdPHe1cz5aQPhYfn441UDuQFrBeBOjjCT eCs7TXe2yF8z7gUmjL+FxR0s/FcfF/S5l47L0zyORJdyEcTammDpA1K3zu94EvF38U9e tqQmICXgS+SZXacQiitKM9KGIWQQ1CTY9zPjgE5W6KeKr6O09J7xecLBZ6s/pG/ZNovK NNr7zhJumwN5FF3HmBfoJr+0QBLhB+vegeSpuSdXi+hBgleIrFobT2zE8UxgHl4blA0S 9PgKGI2tmj4ffBi2UCbWaM42tExV5uaZRvBRRF0tsaUE21KdQ1bRYSw+NNP8Z1slZzwP CJ5w== X-Gm-Message-State: ANhLgQ1QeH0H3JfnLKxLk00vNd7udY078QyNNzmJvqX8NLmtYMNmaGa/ 8oMSz3jSZ/aKbxFypC9wnPryhj2h/P9ruw== X-Google-Smtp-Source: ADFU+vsSgHQI4g//WoEhtqdkOPMcFBWKNNEztsa+iIBET4BScmFsd2p/Z19QqH13T5Mkl4eCyEIg0Q== X-Received: by 2002:adf:b317:: with SMTP id j23mr21968013wrd.413.1583768653111; Mon, 09 Mar 2020 08:44:13 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v4 04/18] tests/qapi/doc-good.json: Clean up markup Date: Mon, 9 Mar 2020 15:43:51 +0000 Message-Id: <20200309154405.13548-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200309154405.13548-1-peter.maydell@linaro.org> References: <20200309154405.13548-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b 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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Michael Roth , Stefan Hajnoczi , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" doc-good.json tests some oddities of markup that we don't want to accept. Make them match the more restrictive rST syntax: * in a single list the bullet types must all match * lists must have leading and following blank lines * indentation is important * the '|' example syntax is going to go away entirely, so stop testing it This will avoid the tests spuriously breaking when we tighten up the parser code in the following commits. Signed-off-by: Peter Maydell Reviewed-by: Markus Armbruster Reviewed-by: Richard Henderson --- New patch in v2 --- tests/qapi-schema/doc-good.json | 25 +++++++++++++------------ tests/qapi-schema/doc-good.out | 12 ++++++------ tests/qapi-schema/doc-good.texi | 12 +++--------- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/tests/qapi-schema/doc-good.json b/tests/qapi-schema/doc-good.j= son index d992e713d97..a45dc22848c 100644 --- a/tests/qapi-schema/doc-good.json +++ b/tests/qapi-schema/doc-good.json @@ -10,25 +10,25 @@ # # *strong* _with emphasis_ # @var {in braces} +# # * List item one -# - Two, multiple +# * Two, multiple # lines # -# 3. Three -# Still in list +# * Three +# Still in list +# +# Not in list # -# Not in list # - Second list -# Note: still in list +# Note: still in list # # Note: not in list +# # 1. Third list # is numbered # -# - another item -# -# | example -# | multiple lines +# 2. another item # # Returns: the King # Since: the first age @@ -62,7 +62,7 @@ ## # @Base: # @base1: -# the first member +# the first member ## { 'struct': 'Base', 'data': { 'base1': 'Enum' } } =20 @@ -101,7 +101,7 @@ ## # @Alternate: # @i: an integer -# @b is undocumented +# @b is undocumented ## { 'alternate': 'Alternate', 'data': { 'i': 'int', 'b': 'bool' } } @@ -115,7 +115,7 @@ # @arg1: the first argument # # @arg2: the second -# argument +# argument # # Features: # @cmd-feat1: a feature @@ -124,6 +124,7 @@ # Returns: @Object # TODO: frobnicate # Notes: +# # - Lorem ipsum dolor sit amet # - Ut enim ad minim veniam # diff --git a/tests/qapi-schema/doc-good.out b/tests/qapi-schema/doc-good.out index 4c9406a464d..9503a3a3178 100644 --- a/tests/qapi-schema/doc-good.out +++ b/tests/qapi-schema/doc-good.out @@ -68,25 +68,25 @@ doc freeform =20 *strong* _with emphasis_ @var {in braces} + * List item one -- Two, multiple +* Two, multiple lines =20 -3. Three +* Three Still in list =20 Not in list + - Second list Note: still in list =20 Note: not in list + 1. Third list is numbered =20 -- another item - -| example -| multiple lines +2. another item =20 Returns: the King Since: the first age diff --git a/tests/qapi-schema/doc-good.texi b/tests/qapi-schema/doc-good.t= exi index d4b15dabf03..1e8063c8579 100644 --- a/tests/qapi-schema/doc-good.texi +++ b/tests/qapi-schema/doc-good.texi @@ -6,6 +6,7 @@ =20 @strong{strong} @emph{with emphasis} @code{var} @{in braces@} + @itemize @bullet @item List item one @@ -20,6 +21,7 @@ Still in list @end itemize =20 Not in list + @itemize @minus @item Second list @@ -28,6 +30,7 @@ Note: still in list @end itemize =20 Note: not in list + @enumerate @item Third list @@ -36,15 +39,6 @@ is numbered @item another item =20 -@example -example -@end example - -@example -multiple lines -@end example - - @end enumerate =20 Returns: the King --=20 2.20.1