From nobody Tue Nov 26 23:35:43 2024 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.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562387879; cv=none; d=zoho.com; s=zohoarc; b=L9J17kjNUtF/KozHoVLfJe8Gc5DMWmpgv5B3Ny2PtQMtq4k1g0xXlHLGIEOfrMhFs9WFYiZNQVioIa0mElmvWCeeIlyy4Owb/bscSv92o0i+QP95sqRlPb8ep/w+g/HiSPYUZ4byahqpY/8mBy+/xC2SXgHYVJkHrfF1Ol9gJ4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562387879; h=Content-Type: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:ARC-Authentication-Results; bh=Spxnc8FIgNZTWWiH0j508yJAzawN/P8w/lQLRbEaxpc=; b=MFN9k3zV0faqfO83wg1BufUeE9NG0f6XjkRN0+O0vIQf3IgRhyLxlxPvQ2lzWqAbpsG5YhSOnmuwhZB1rOPtmplHqybDobTbc90y1Ggp+IKrGd0drATIwTD2/qgDfjIEyq55WvBgENRhj/+vp07gpP20O5Av7LF7mn/VRWU8z9I= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1562387879607952.7620638958808; Fri, 5 Jul 2019 21:37:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 823163083363; Sat, 6 Jul 2019 04:37:56 +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 2ED5D51409; Sat, 6 Jul 2019 04:37:55 +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 3213918089C8; Sat, 6 Jul 2019 04:37:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x664bj3O006727 for ; Sat, 6 Jul 2019 00:37:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 934401001947; Sat, 6 Jul 2019 04:37:45 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-152.phx2.redhat.com [10.3.116.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32E0D1001B2E; Sat, 6 Jul 2019 04:37:44 +0000 (UTC) From: Eric Blake To: libvir-list@redhat.com Date: Fri, 5 Jul 2019 23:37:28 -0500 Message-Id: <20190706043735.26284-2-eblake@redhat.com> In-Reply-To: <20190706043735.26284-1-eblake@redhat.com> References: <20190706043735.26284-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 1/8] snapshot: Rename qemu domain snapshot test 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: , 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Sat, 06 Jul 2019 04:37:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Make it obvious that the domainsnapshotxml2xml test is only run when compiling in support for qemu. Suggested-by: Peter Krempa Signed-off-by: Eric Blake --- tests/Makefile.am | 14 +++++++------- .../description_only.xml | 0 .../disk-invalid.xml | 0 .../disk-network-seclabel-invalid.xml | 0 .../disk-seclabel.xml | 0 .../disk_driver_name_null.xml | 0 .../disk_snapshot.xml | 0 .../empty.xml | 0 .../external_vm.xml | 0 .../name_and_description.xml | 0 .../name_only.xml | 0 .../noparent.xml | 0 .../all_parameters.xml | 0 .../disk-seclabel.xml | 0 .../disk_driver_name_null.xml | 0 .../disk_snapshot.xml | 0 .../disk_snapshot_redefine.xml | 0 .../empty.xml | 0 .../external_vm.xml | 0 .../external_vm_redefine.xml | 0 .../full_domain.xml | 0 .../metadata.xml | 0 .../name_and_description.xml | 0 .../noparent.xml | 0 .../noparent_nodescription.xml | 0 .../noparent_nodescription_noactive.xml | 0 ...l2xmltest.c =3D> qemudomainsnapshotxml2xmltest.c} | 12 ++++++------ tests/virschematest.c | 4 ++-- 28 files changed, 15 insertions(+), 15 deletions(-) rename tests/{domainsnapshotxml2xmlin =3D> qemudomainsnapshotxml2xmlin}/de= scription_only.xml (100%) rename tests/{domainsnapshotxml2xmlin =3D> qemudomainsnapshotxml2xmlin}/di= sk-invalid.xml (100%) rename tests/{domainsnapshotxml2xmlin =3D> qemudomainsnapshotxml2xmlin}/di= sk-network-seclabel-invalid.xml (100%) rename tests/{domainsnapshotxml2xmlin =3D> qemudomainsnapshotxml2xmlin}/di= sk-seclabel.xml (100%) rename tests/{domainsnapshotxml2xmlin =3D> qemudomainsnapshotxml2xmlin}/di= sk_driver_name_null.xml (100%) rename tests/{domainsnapshotxml2xmlin =3D> qemudomainsnapshotxml2xmlin}/di= sk_snapshot.xml (100%) rename tests/{domainsnapshotxml2xmlin =3D> qemudomainsnapshotxml2xmlin}/em= pty.xml (100%) rename tests/{domainsnapshotxml2xmlin =3D> qemudomainsnapshotxml2xmlin}/ex= ternal_vm.xml (100%) rename tests/{domainsnapshotxml2xmlin =3D> qemudomainsnapshotxml2xmlin}/na= me_and_description.xml (100%) rename tests/{domainsnapshotxml2xmlin =3D> qemudomainsnapshotxml2xmlin}/na= me_only.xml (100%) rename tests/{domainsnapshotxml2xmlin =3D> qemudomainsnapshotxml2xmlin}/no= parent.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= all_parameters.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= disk-seclabel.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= disk_driver_name_null.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= disk_snapshot.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= disk_snapshot_redefine.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= empty.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= external_vm.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= external_vm_redefine.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= full_domain.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= metadata.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= name_and_description.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= noparent.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= noparent_nodescription.xml (100%) rename tests/{domainsnapshotxml2xmlout =3D> qemudomainsnapshotxml2xmlout}/= noparent_nodescription_noactive.xml (100%) rename tests/{domainsnapshotxml2xmltest.c =3D> qemudomainsnapshotxml2xmlte= st.c} (93%) diff --git a/tests/Makefile.am b/tests/Makefile.am index 115afa1c1a..e57d0da58a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -85,8 +85,6 @@ EXTRA_DIST =3D \ domaincapsschemadata \ domainconfdata \ domainschemadata \ - domainsnapshotxml2xmlin \ - domainsnapshotxml2xmlout \ fchostdata \ genericxml2xmlindata \ genericxml2xmloutdata \ @@ -112,6 +110,8 @@ EXTRA_DIST =3D \ qemublocktestdata \ qemucapabilitiesdata \ qemucaps2xmloutdata \ + qemudomainsnapshotxml2xmlin \ + qemudomainsnapshotxml2xmlout \ qemuhotplugtestcpus \ qemuhotplugtestdevices \ qemuhotplugtestdomains \ @@ -275,7 +275,7 @@ endif WITH_LIBXL if WITH_QEMU test_programs +=3D qemuxml2argvtest qemuxml2xmltest \ - domainsnapshotxml2xmltest \ + qemudomainsnapshotxml2xmltest \ qemumonitorjsontest qemuhotplugtest \ qemuagenttest qemucapabilitiestest qemucaps2xmltest \ qemumemlocktest \ @@ -656,10 +656,10 @@ qemublocktest_LDADD =3D \ $(qemu_LDADDS) \ $(NULL) -domainsnapshotxml2xmltest_SOURCES =3D \ - domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \ +qemudomainsnapshotxml2xmltest_SOURCES =3D \ + qemudomainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h -domainsnapshotxml2xmltest_LDADD =3D $(qemu_LDADDS) +qemudomainsnapshotxml2xmltest_LDADD =3D $(qemu_LDADDS) qemumemlocktest_SOURCES =3D \ qemumemlocktest.c \ @@ -691,7 +691,7 @@ qemufirmwaretest_LDADD =3D $(qemu_LDADDS) else ! WITH_QEMU EXTRA_DIST +=3D qemuxml2argvtest.c qemuxml2xmltest.c \ - domainsnapshotxml2xmltest.c \ + qemudomainsnapshotxml2xmltest.c \ testutilsqemu.c testutilsqemu.h \ testutilsqemuschema.c testutilsqemuschema.h \ qemumonitorjsontest.c qemuhotplugtest.c \ diff --git a/tests/domainsnapshotxml2xmlin/description_only.xml b/tests/qem= udomainsnapshotxml2xmlin/description_only.xml similarity index 100% rename from tests/domainsnapshotxml2xmlin/description_only.xml rename to tests/qemudomainsnapshotxml2xmlin/description_only.xml diff --git a/tests/domainsnapshotxml2xmlin/disk-invalid.xml b/tests/qemudom= ainsnapshotxml2xmlin/disk-invalid.xml similarity index 100% rename from tests/domainsnapshotxml2xmlin/disk-invalid.xml rename to tests/qemudomainsnapshotxml2xmlin/disk-invalid.xml diff --git a/tests/domainsnapshotxml2xmlin/disk-network-seclabel-invalid.xm= l b/tests/qemudomainsnapshotxml2xmlin/disk-network-seclabel-invalid.xml similarity index 100% rename from tests/domainsnapshotxml2xmlin/disk-network-seclabel-invalid.xml rename to tests/qemudomainsnapshotxml2xmlin/disk-network-seclabel-invalid.x= ml diff --git a/tests/domainsnapshotxml2xmlin/disk-seclabel.xml b/tests/qemudo= mainsnapshotxml2xmlin/disk-seclabel.xml similarity index 100% rename from tests/domainsnapshotxml2xmlin/disk-seclabel.xml rename to tests/qemudomainsnapshotxml2xmlin/disk-seclabel.xml diff --git a/tests/domainsnapshotxml2xmlin/disk_driver_name_null.xml b/test= s/qemudomainsnapshotxml2xmlin/disk_driver_name_null.xml similarity index 100% rename from tests/domainsnapshotxml2xmlin/disk_driver_name_null.xml rename to tests/qemudomainsnapshotxml2xmlin/disk_driver_name_null.xml diff --git a/tests/domainsnapshotxml2xmlin/disk_snapshot.xml b/tests/qemudo= mainsnapshotxml2xmlin/disk_snapshot.xml similarity index 100% rename from tests/domainsnapshotxml2xmlin/disk_snapshot.xml rename to tests/qemudomainsnapshotxml2xmlin/disk_snapshot.xml diff --git a/tests/domainsnapshotxml2xmlin/empty.xml b/tests/qemudomainsnap= shotxml2xmlin/empty.xml similarity index 100% rename from tests/domainsnapshotxml2xmlin/empty.xml rename to tests/qemudomainsnapshotxml2xmlin/empty.xml diff --git a/tests/domainsnapshotxml2xmlin/external_vm.xml b/tests/qemudoma= insnapshotxml2xmlin/external_vm.xml similarity index 100% rename from tests/domainsnapshotxml2xmlin/external_vm.xml rename to tests/qemudomainsnapshotxml2xmlin/external_vm.xml diff --git a/tests/domainsnapshotxml2xmlin/name_and_description.xml b/tests= /qemudomainsnapshotxml2xmlin/name_and_description.xml similarity index 100% rename from tests/domainsnapshotxml2xmlin/name_and_description.xml rename to tests/qemudomainsnapshotxml2xmlin/name_and_description.xml diff --git a/tests/domainsnapshotxml2xmlin/name_only.xml b/tests/qemudomain= snapshotxml2xmlin/name_only.xml similarity index 100% rename from tests/domainsnapshotxml2xmlin/name_only.xml rename to tests/qemudomainsnapshotxml2xmlin/name_only.xml diff --git a/tests/domainsnapshotxml2xmlin/noparent.xml b/tests/qemudomains= napshotxml2xmlin/noparent.xml similarity index 100% rename from tests/domainsnapshotxml2xmlin/noparent.xml rename to tests/qemudomainsnapshotxml2xmlin/noparent.xml diff --git a/tests/domainsnapshotxml2xmlout/all_parameters.xml b/tests/qemu= domainsnapshotxml2xmlout/all_parameters.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/all_parameters.xml rename to tests/qemudomainsnapshotxml2xmlout/all_parameters.xml diff --git a/tests/domainsnapshotxml2xmlout/disk-seclabel.xml b/tests/qemud= omainsnapshotxml2xmlout/disk-seclabel.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/disk-seclabel.xml rename to tests/qemudomainsnapshotxml2xmlout/disk-seclabel.xml diff --git a/tests/domainsnapshotxml2xmlout/disk_driver_name_null.xml b/tes= ts/qemudomainsnapshotxml2xmlout/disk_driver_name_null.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/disk_driver_name_null.xml rename to tests/qemudomainsnapshotxml2xmlout/disk_driver_name_null.xml diff --git a/tests/domainsnapshotxml2xmlout/disk_snapshot.xml b/tests/qemud= omainsnapshotxml2xmlout/disk_snapshot.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/disk_snapshot.xml rename to tests/qemudomainsnapshotxml2xmlout/disk_snapshot.xml diff --git a/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/te= sts/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml rename to tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml diff --git a/tests/domainsnapshotxml2xmlout/empty.xml b/tests/qemudomainsna= pshotxml2xmlout/empty.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/empty.xml rename to tests/qemudomainsnapshotxml2xmlout/empty.xml diff --git a/tests/domainsnapshotxml2xmlout/external_vm.xml b/tests/qemudom= ainsnapshotxml2xmlout/external_vm.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/external_vm.xml rename to tests/qemudomainsnapshotxml2xmlout/external_vm.xml diff --git a/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml b/test= s/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/external_vm_redefine.xml rename to tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml diff --git a/tests/domainsnapshotxml2xmlout/full_domain.xml b/tests/qemudom= ainsnapshotxml2xmlout/full_domain.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/full_domain.xml rename to tests/qemudomainsnapshotxml2xmlout/full_domain.xml diff --git a/tests/domainsnapshotxml2xmlout/metadata.xml b/tests/qemudomain= snapshotxml2xmlout/metadata.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/metadata.xml rename to tests/qemudomainsnapshotxml2xmlout/metadata.xml diff --git a/tests/domainsnapshotxml2xmlout/name_and_description.xml b/test= s/qemudomainsnapshotxml2xmlout/name_and_description.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/name_and_description.xml rename to tests/qemudomainsnapshotxml2xmlout/name_and_description.xml diff --git a/tests/domainsnapshotxml2xmlout/noparent.xml b/tests/qemudomain= snapshotxml2xmlout/noparent.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/noparent.xml rename to tests/qemudomainsnapshotxml2xmlout/noparent.xml diff --git a/tests/domainsnapshotxml2xmlout/noparent_nodescription.xml b/te= sts/qemudomainsnapshotxml2xmlout/noparent_nodescription.xml similarity index 100% rename from tests/domainsnapshotxml2xmlout/noparent_nodescription.xml rename to tests/qemudomainsnapshotxml2xmlout/noparent_nodescription.xml diff --git a/tests/domainsnapshotxml2xmlout/noparent_nodescription_noactive= .xml b/tests/qemudomainsnapshotxml2xmlout/noparent_nodescription_noactive.x= ml similarity index 100% rename from tests/domainsnapshotxml2xmlout/noparent_nodescription_noactive.= xml rename to tests/qemudomainsnapshotxml2xmlout/noparent_nodescription_noactiv= e.xml diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxm= l2xmltest.c similarity index 93% rename from tests/domainsnapshotxml2xmltest.c rename to tests/qemudomainsnapshotxml2xmltest.c index c34ab0bc89..10ea9cf8d2 100644 --- a/tests/domainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -144,18 +144,18 @@ mymain(void) } while (0) # define DO_TEST_IN(name, uuid) DO_TEST("in->in", name, \ - "domainsnapshotxml2xmlin", \ - "domainsnapshotxml2xmlin", \ + "qemudomainsnapshotxml2xmlin", \ + "qemudomainsnapshotxml2xmlin", \ uuid, 0, 0) # define DO_TEST_OUT(name, uuid, internal) \ - DO_TEST("out->out", name, "domainsnapshotxml2xmlout", \ - "domainsnapshotxml2xmlout", uuid, 0, internal | TEST_REDEFINE) + DO_TEST("out->out", name, "qemudomainsnapshotxml2xmlout", \ + "qemudomainsnapshotxml2xmlout", uuid, 0, internal | TEST_REDEF= INE) # define DO_TEST_INOUT(name, uuid, time, flags) \ DO_TEST("in->out", name, \ - "domainsnapshotxml2xmlin",\ - "domainsnapshotxml2xmlout",\ + "qemudomainsnapshotxml2xmlin",\ + "qemudomainsnapshotxml2xmlout",\ uuid, time, flags) /* Unset or set all envvars here that are copied in qemudBuildCommandL= ine diff --git a/tests/virschematest.c b/tests/virschematest.c index ff25f7781e..b7c2f7cfaa 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -222,8 +222,8 @@ mymain(void) "genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconf= igdata", "qemuhotplugtestdomains"); DO_TEST_DIR("domaincaps.rng", "domaincapsschemadata"); - DO_TEST_DIR("domainsnapshot.rng", "domainsnapshotxml2xmlin", - "domainsnapshotxml2xmlout"); + DO_TEST_DIR("domainsnapshot.rng", "qemudomainsnapshotxml2xmlin", + "qemudomainsnapshotxml2xmlout"); DO_TEST_DIR("interface.rng", "interfaceschemadata"); DO_TEST_DIR("network.rng", "../src/network", "networkxml2xmlin", "networkxml2xmlout", "networkxml2confdata"); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list