From nobody Tue Nov 26 10:37:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1708944739; cv=none; d=zohomail.com; s=zohoarc; b=JfzY0Z5MrnIz8/i7dwRfEc61RT5fuOEeN8Fu/cwUr2A0mnWQZoIXmJqjR7ihTMf+JKcpnxmznr/C4tJBfCw2xwBM7aKXMVnQbkrIo92q5CP+sfWJygrOauAWeyIaoMQo/hglhbd9KKcgAR/seMon0X63McL7XiUmxJWssV+k2a8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708944739; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3GWUHtjiTVTcyXYDkXaYPS+RGx2VTtD2GOtHpGZPuXw=; b=f39jD5ZdWF0xSbc4IJnUAftKNYB8iw4Tf1WE11zeKBFGz27HDcJ8/cUuLXc/Ztmo+3whcudEViJO4cpZR6lIaFBooE3QBjEKNJc5O4a0JqmR1YfC+M3w/vP+LLrS5Q/LpcZYVrC2XYsh5ujuV2dXya0bJxo+55fE0npkBroUj8A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1708944739160636.5029191812127; Mon, 26 Feb 2024 02:52:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1reYZE-0002lf-Sz; Mon, 26 Feb 2024 05:50:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reYYh-0002bi-4P for qemu-devel@nongnu.org; Mon, 26 Feb 2024 05:50:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reYYa-0003jR-JR for qemu-devel@nongnu.org; Mon, 26 Feb 2024 05:50:06 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-398-5EscpoW4Owy1Kn189Ql_uw-1; Mon, 26 Feb 2024 05:49:56 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A957C3C00085; Mon, 26 Feb 2024 10:49:55 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7FD491C06714; Mon, 26 Feb 2024 10:49:55 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 89B8121E6682; Mon, 26 Feb 2024 11:49:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708944600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3GWUHtjiTVTcyXYDkXaYPS+RGx2VTtD2GOtHpGZPuXw=; b=UrFscSb8Cpshshmol92OYeGl0AoFmM6gkZBDATl+7cbms9Mhk60vANXuONPLgrPjFbt6dn QL+0tKQ9MZKnIn0w4Rfh4MFsRLRsI1i1hqEVNKBZHZcRYaDTtOllQGdoeKdmRfOLSjJSZX D4ECxFSZsFjUkXEwnDVwrolhe2CBHw4= X-MC-Unique: 5EscpoW4Owy1Kn189Ql_uw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 02/17] tests/qapi-schema: Fix test 'QAPI rST doc' Date: Mon, 26 Feb 2024 11:49:39 +0100 Message-ID: <20240226104954.3781985-3-armbru@redhat.com> In-Reply-To: <20240226104954.3781985-1-armbru@redhat.com> References: <20240226104954.3781985-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.097, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1708944740481100003 The test compares Sphinx plain-text output against a golden reference. To work on Windows hosts, it filters out carriage returns in both files. Unfortunately, the filter doesn't work: it creates an empty file. Comparing empty files always succeeds. Fix the filter, and update the golden reference to current Sphinx output. Signed-off-by: Markus Armbruster Message-ID: <20240216145841.2099240-2-armbru@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/qapi-schema/doc-good.txt | 21 +++++++++------------ tests/qapi-schema/meson.build | 10 ++++++---- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/tests/qapi-schema/doc-good.txt b/tests/qapi-schema/doc-good.txt index b3b76bd43f..879f6ff50a 100644 --- a/tests/qapi-schema/doc-good.txt +++ b/tests/qapi-schema/doc-good.txt @@ -44,7 +44,7 @@ Values ~~~~~~ =20 "one" (**If: **"IFONE") - The _one_ {and only} + The _one_ {and only}, description on the same line =20 "two" Not documented @@ -76,7 +76,7 @@ Members ~~~~~~~ =20 "base1": "Enum" - the first member + description starts on a new line, minimally indented =20 =20 If @@ -90,7 +90,9 @@ If =20 A paragraph =20 -Another paragraph (but no "var": line) +Another paragraph + +"var1" is undocumented =20 =20 Members @@ -141,7 +143,8 @@ Members ~~~~~~~ =20 "i": "int" - an integer "b" is undocumented + description starts on the same line remainder indented the same "b" + is undocumented =20 "b": "boolean" Not documented @@ -172,10 +175,10 @@ Arguments ~~~~~~~~~ =20 "arg1": "int" - the first argument + description starts on a new line, indented =20 "arg2": "string" (optional) - the second argument + description starts on the same line remainder indented differently =20 "arg3": "boolean" Not documented @@ -203,12 +206,6 @@ Returns "Object" =20 =20 -TODO -~~~~ - -frobnicate - - Notes ~~~~~ =20 diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index af085f745d..44a9385563 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -273,15 +273,17 @@ if build_docs output: ['doc-good.txt.nocr'], input: qapi_doc_out[0], build_by_default: true, - command: [remove_cr, '@INPUT@'], - capture: true) + command: [remove_cr], + capture: true, + feed: true) =20 qapi_doc_ref_nocr =3D custom_target('QAPI rST doc reference newline-sani= tized', output: ['doc-good.ref.nocr'], input: files('doc-good.txt'), build_by_default: true, - command: [remove_cr, '@INPUT@'], - capture: true) + command: [remove_cr], + capture: true, + feed: true) =20 test('QAPI rST doc', diff, args: ['-u', qapi_doc_ref_nocr[0], qapi_doc_o= ut_nocr[0]], suite: ['qapi-schema', 'qapi-doc']) --=20 2.43.0