From nobody Mon Feb 9 20:36:53 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1711632773488983.0120213757227; Thu, 28 Mar 2024 06:32:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4CAFC1F6E; Thu, 28 Mar 2024 09:32:52 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0857A2209; Thu, 28 Mar 2024 09:23:06 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D658821F2; Thu, 28 Mar 2024 09:22:57 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 21ADC1E29 for ; Thu, 28 Mar 2024 09:22:44 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-650-othctN_BNeuM5aFhFFTlig-1; Thu, 28 Mar 2024 09:22:42 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 4D84D8007B0 for ; Thu, 28 Mar 2024 13:22:42 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id B97A8200E1B5 for ; Thu, 28 Mar 2024 13:22:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: othctN_BNeuM5aFhFFTlig-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 07/35] virshtest: Adapt some 'escaping' tests via DO_TEST_SCRIPT Date: Thu, 28 Mar 2024 14:22:29 +0100 Message-ID: <20536480763426529eb2160a419847eeef511fa4.1711129973.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: I2TCGEBOK2FBLPV5D5H6SQZZ67YLVFKF X-Message-ID-Hash: I2TCGEBOK2FBLPV5D5H6SQZZ67YLVFKF X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1711632775449100001 Express what's possible via a "virsh script" rather than invoking separate virsh for each one. We need to keep a few for parity as the argument parser behaves differently when processing argv-like input compared to a string. Signed-off-by: Peter Krempa --- tests/virshtest.c | 20 +------------------- tests/virshtestdata/echo-escaping.in | 11 +++++++++++ tests/virshtestdata/echo-escaping.out | 11 +++++++++++ 3 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 tests/virshtestdata/echo-escaping.in create mode 100644 tests/virshtestdata/echo-escaping.out diff --git a/tests/virshtest.c b/tests/virshtest.c index a60cfdf7a0..4b02ef3a49 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -610,6 +610,7 @@ mymain(void) "echo \"'\" '\"' '\\'\"\\\\\""); /* Tests of echo flags. */ + DO_TEST_SCRIPT("echo-escaping", NULL, VIRSH_DEFAULT); DO_TEST(13, "a A 0 + * ; . ' \" / ? =3D \n < > &\n", "echo", "a", "A", "0", "+", "*", ";", ".", "'", "\"", "/", "?", "=3D", " ", "\n", "<", ">", "&"); @@ -619,25 +620,6 @@ mymain(void) DO_TEST(15, "a A 0 + * ; . ' " / ? =3D \n < > &\= n", "echo", "--xml", "a", "A", "0", "+", "*", ";", ".", "'", "\"", "/", "?", "=3D", " ", "\n", "<", ">", "&"); - DO_TEST(16, "a A 0 + '*' ';' . ''\\''' '\"' / '?' =3D ' ' '\n' '<' '>'= '&'\n", - "echo", "--shell", "a", "A", "0", "+", "*", ";", ".", "\'", - "\"", "/", "?", "=3D", " ", "\n", "<", ">", "&"); - DO_TEST(17, "\n", - "echo", ""); - DO_TEST(18, "''\n", - "echo", "--shell", ""); - DO_TEST(19, "\n", - "echo", "--xml", ""); - DO_TEST(20, "''\n", - "echo", "--shell", ""); - DO_TEST(21, "\n", - "echo ''"); - DO_TEST(22, "''\n", - "echo --shell \"\""); - DO_TEST(23, "\n", - "echo --xml ''"); - DO_TEST(24, "''\n", - "echo --shell \"\"''"); /* Tests of -- handling. */ DO_TEST(25, "a\n", diff --git a/tests/virshtestdata/echo-escaping.in b/tests/virshtestdata/ech= o-escaping.in new file mode 100644 index 0000000000..26d4e4cc18 --- /dev/null +++ b/tests/virshtestdata/echo-escaping.in @@ -0,0 +1,11 @@ +echo a A 0 + * . \' / ? =3D < > & +echo --xml a A 0 + * . \' / ? =3D < > & +echo --shell a A 0 + * . \' / ? =3D < > & +echo "" +echo --shell +echo --xml +echo --shell +echo '' +echo --shell "" +echo --xml '' +echo --shell ""'' diff --git a/tests/virshtestdata/echo-escaping.out b/tests/virshtestdata/ec= ho-escaping.out new file mode 100644 index 0000000000..ff3e0a98b3 --- /dev/null +++ b/tests/virshtestdata/echo-escaping.out @@ -0,0 +1,11 @@ +a A 0 + * . ' / ? =3D < > & +a A 0 + * . ' / ? =3D < > & +a A 0 + '*' . ''\''' / '?' =3D '<' '>' '&' + + + + + +'' + +'' --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org