From nobody Mon Feb 9 03:20:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1490702294105498.1188577220207; Tue, 28 Mar 2017 04:58:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 97CAE41A40; Tue, 28 Mar 2017 11:58:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6BDD68FB10; Tue, 28 Mar 2017 11:58:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2082318523C8; Tue, 28 Mar 2017 11:58:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2SBw4Ot027397 for ; Tue, 28 Mar 2017 07:58:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9865C7F965; Tue, 28 Mar 2017 11:58:04 +0000 (UTC) Received: from angien.brq.redhat.com (dhcp129-47.brq.redhat.com [10.34.129.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE8A317DE5; Tue, 28 Mar 2017 11:58:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 97CAE41A40 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 97CAE41A40 From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 28 Mar 2017 13:58:56 +0200 Message-Id: <01a74a80817360538e0b1e74886c70945a85a0d7.1490702145.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 1/4] tests: schema: Add possibility to validate individual files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 28 Mar 2017 11:58:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Sometimes it may be desired to validate individual files against a schema. Refactor the data structures to unify them and introduce a new macro DO_TEST_FILE(schema, xmlfile) which will test the XML file against the given schema file. --- tests/virschematest.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/tests/virschematest.c b/tests/virschematest.c index faf66d642..beefabc96 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -35,6 +35,7 @@ VIR_LOG_INIT("tests.schematest"); struct testSchemaData { virXMLValidatorPtr validator; + const char *schema; const char *xml_path; }; @@ -140,15 +141,10 @@ testSchemaDirs(const char *schema, virXMLValidatorPtr= validator, ...) } -struct testSchemaFileData { - virXMLValidatorPtr validator; - const char *schema; -}; - static int testSchemaGrammar(const void *opaque) { - struct testSchemaFileData *data =3D (struct testSchemaFileData *) opaq= ue; + struct testSchemaData *data =3D (struct testSchemaData *) opaque; char *schema_path; int ret =3D -1; @@ -171,7 +167,7 @@ static int mymain(void) { int ret =3D 0; - struct testSchemaFileData data; + struct testSchemaData data; memset(&data, 0, sizeof(data)); @@ -196,6 +192,30 @@ mymain(void) } = \ } while (0) +#define DO_TEST_FILE(sch, xmlfile) = \ + do { = \ + data.schema =3D sch; = \ + data.xml_path =3D xmlfile; = \ + if (virTestRun("test schema grammar file: " sch, = \ + testSchemaGrammar, &data) =3D=3D 0) { = \ + /* initialize the validator even if the schema test = \ + * was skipped because of VIR_TEST_RANGE */ = \ + if (!data.validator && testSchemaGrammar(&data) < 0) { = \ + ret =3D -1; = \ + break; = \ + } = \ + if (virTestRun("Checking " xmlfile " against " sch, = \ + testSchemaFile, &data) < 0) = \ + ret =3D -1; = \ + = \ + virXMLValidatorFree(data.validator); = \ + data.validator =3D NULL; = \ + } else { = \ + ret =3D -1; = \ + } = \ + } while (0) + + DO_TEST("capability.rng", "capabilityschemadata", "xencapsdata"); DO_TEST("domain.rng", "domainschemadata", "qemuargv2xmldata", "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata", --=20 2.12.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list