From nobody Mon Feb 9 19:53:58 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 1490772455380706.1281484390681; Wed, 29 Mar 2017 00:27:35 -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 D8ED73B713; Wed, 29 Mar 2017 07:27:33 +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 AD0FE9133A; Wed, 29 Mar 2017 07:27:33 +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 6322F18523CE; Wed, 29 Mar 2017 07:27:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2T7RLo8001378 for ; Wed, 29 Mar 2017 03:27:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id BDCB093450; Wed, 29 Mar 2017 07:27:21 +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 EB8558AC59; Wed, 29 Mar 2017 07:27:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D8ED73B713 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 D8ED73B713 From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 29 Mar 2017 09:28:13 +0200 Message-Id: <0d1e98efb092093fd57a1fe20f43717dd186c017.1490772351.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH v2 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]); Wed, 29 Mar 2017 07:27:34 +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 | 75 ++++++++++++++++++++++++++++++++---------------= ---- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/tests/virschematest.c b/tests/virschematest.c index faf66d642..b73555da8 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,11 +167,11 @@ static int mymain(void) { int ret =3D 0; - struct testSchemaFileData data; + struct testSchemaData data; memset(&data, 0, sizeof(data)); -#define DO_TEST(sch, ...) = \ +#define DO_TEST_DIR(sch, ...) = \ do { = \ data.schema =3D sch; = \ if (virTestRun("test schema grammar file: " sch, = \ @@ -196,26 +192,49 @@ mymain(void) } = \ } while (0) - DO_TEST("capability.rng", "capabilityschemadata", "xencapsdata"); - DO_TEST("domain.rng", "domainschemadata", "qemuargv2xmldata", - "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata", - "xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata", - "lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmlindat= a", - "genericxml2xmloutdata", "xlconfigdata", - "qemuhotplugtestdomains"); - DO_TEST("domaincaps.rng", "domaincapsschemadata"); - DO_TEST("domainsnapshot.rng", "domainsnapshotxml2xmlin", - "domainsnapshotxml2xmlout"); - DO_TEST("interface.rng", "interfaceschemadata"); - DO_TEST("network.rng", "../src/network", "networkxml2xmlin", - "networkxml2xmlout", "networkxml2confdata"); - DO_TEST("nodedev.rng", "nodedevschemadata"); - DO_TEST("nwfilter.rng", "nwfilterxml2xmlout"); - DO_TEST("secret.rng", "secretxml2xmlin"); - DO_TEST("storagepool.rng", "storagepoolxml2xmlin", "storagepoolxml2xml= out", - "storagepoolschemadata"); - DO_TEST("storagevol.rng", "storagevolxml2xmlin", "storagevolxml2xmlout= ", - "storagevolschemadata"); +#define DO_TEST_FILE(sch, xmlfile) = \ + do { = \ + data.schema =3D sch; = \ + data.xml_path =3D abs_srcdir "/" 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_DIR("capability.rng", "capabilityschemadata", "xencapsdata"); + DO_TEST_DIR("domain.rng", "domainschemadata", "qemuargv2xmldata", + "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata", + "xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata", + "lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmli= ndata", + "genericxml2xmloutdata", "xlconfigdata", + "qemuhotplugtestdomains"); + DO_TEST_DIR("domaincaps.rng", "domaincapsschemadata"); + DO_TEST_DIR("domainsnapshot.rng", "domainsnapshotxml2xmlin", + "domainsnapshotxml2xmlout"); + DO_TEST_DIR("interface.rng", "interfaceschemadata"); + DO_TEST_DIR("network.rng", "../src/network", "networkxml2xmlin", + "networkxml2xmlout", "networkxml2confdata"); + DO_TEST_DIR("nodedev.rng", "nodedevschemadata"); + DO_TEST_DIR("nwfilter.rng", "nwfilterxml2xmlout"); + DO_TEST_DIR("secret.rng", "secretxml2xmlin"); + DO_TEST_DIR("storagepool.rng", "storagepoolxml2xmlin", "storagepoolxml= 2xmlout", + "storagepoolschemadata"); + DO_TEST_DIR("storagevol.rng", "storagevolxml2xmlin", "storagevolxml2xm= lout", + "storagevolschemadata"); return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } --=20 2.12.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list