From nobody Thu May 15 03:16:16 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1512460897073977.3549148458961; Tue, 5 Dec 2017 00:01:37 -0800 (PST) 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 1D259356FF; Tue, 5 Dec 2017 08:01:36 +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 E8731182F0; Tue, 5 Dec 2017 08:01:35 +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 A7AAB1800FC5; Tue, 5 Dec 2017 08:01:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vB581V40019850 for ; Tue, 5 Dec 2017 03:01:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id B04F8183EF; Tue, 5 Dec 2017 08:01:31 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37FD65C661 for ; Tue, 5 Dec 2017 08:01:27 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 5 Dec 2017 09:01:19 +0100 Message-Id: <45819b4e6ae70947ee30c0c77de9e6ea4af79e3e.1512460584.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] test: Drop useless prefix for genericxml2xml test data 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, 05 Dec 2017 08:01:36 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There's no reason for the files to have generic- prefix since they all live under genericxml2xmlindata and genericxml2xmloutdata directories. Signed-off-by: Michal Privoznik --- tests/genericxml2xmltest.c | 4 = ++-- ...-reconnect-invalid-mode.xml =3D> chardev-reconnect-invalid-mode.xml} | 0 ...nect-missing-timeout.xml =3D> chardev-reconnect-missing-timeout.xml} | 0 .../{generic-chardev-reconnect.xml =3D> chardev-reconnect.xml} | 0 ...eric-chardev-tcp-missing-host.xml =3D> chardev-tcp-missing-host.xml} | 0 ...hardev-tcp-missing-service.xml =3D> chardev-tcp-missing-service.xml} | 0 ...hardev-tcp-multiple-source.xml =3D> chardev-tcp-multiple-source.xml} | 0 .../genericxml2xmlindata/{generic-chardev-tcp.xml =3D> chardev-tcp.xml} | 0 ...ng-connect-service.xml =3D> chardev-udp-missing-connect-service.xml} | 0 ...hardev-udp-multiple-source.xml =3D> chardev-udp-multiple-source.xml} | 0 .../genericxml2xmlindata/{generic-chardev-udp.xml =3D> chardev-udp.xml} | 0 ...dirdev-missing-path.xml =3D> chardev-unix-redirdev-missing-path.xml} | 0 ...ev-unix-rng-missing-path.xml =3D> chardev-unix-rng-missing-path.xml} | 0 ...tcard-missing-path.xml =3D> chardev-unix-smartcard-missing-path.xml} | 0 .../{generic-chardev-unix.xml =3D> chardev-unix.xml} | 0 .../{generic-cpu-cache-disable.xml =3D> cpu-cache-disable.xml} | 0 .../{generic-cpu-cache-emulate.xml =3D> cpu-cache-emulate.xml} | 0 .../{generic-cpu-cache-passthrough.xml =3D> cpu-cache-passthrough.xml} | 0 .../{generic-disk-network-http.xml =3D> disk-network-http.xml} | 0 .../genericxml2xmlindata/{generic-disk-virtio.xml =3D> disk-virtio.xml} | 0 ...k-compat-mismatch.xml =3D> graphics-listen-back-compat-mismatch.xml} | 0 ...raphics-listen-back-compat.xml =3D> graphics-listen-back-compat.xml} | 0 ...eric-graphics-vnc-autoport-no.xml =3D> graphics-vnc-autoport-no.xml} | 0 ...ics-vnc-listen-attr-only.xml =3D> graphics-vnc-listen-attr-only.xml} | 0 ...en-element-minimal.xml =3D> graphics-vnc-listen-element-minimal.xml} | 0 ...-with-address.xml =3D> graphics-vnc-listen-element-with-address.xml} | 0 ...eric-graphics-vnc-manual-port.xml =3D> graphics-vnc-manual-port.xml} | 0 .../{generic-graphics-vnc-minimal.xml =3D> graphics-vnc-minimal.xml} | 0 ...listen-address.xml =3D> graphics-vnc-socket-attr-listen-address.xml} | 0 ...smatch.xml =3D> graphics-vnc-socket-attr-listen-socket-mismatch.xml} | 0 ...r-listen-socket.xml =3D> graphics-vnc-socket-attr-listen-socket.xml} | 0 ...-graphics-vnc-socket-listen.xml =3D> graphics-vnc-socket-listen.xml} | 0 .../{generic-graphics-vnc-socket.xml =3D> graphics-vnc-socket.xml} | 0 .../{generic-name-slash-fail.xml =3D> name-slash-fail.xml} | 0 tests/genericxml2xmlindata/{generic-perf.xml =3D> perf.xml} | 0 .../{generic-vcpus-individual.xml =3D> vcpus-individual.xml} | 0 .../{generic-chardev-reconnect.xml =3D> chardev-reconnect.xml} | 0 .../{generic-chardev-tcp.xml =3D> chardev-tcp.xml} | 0 .../{generic-chardev-udp.xml =3D> chardev-udp.xml} | 0 .../{generic-chardev-unix.xml =3D> chardev-unix.xml} | 0 .../{generic-disk-virtio.xml =3D> disk-virtio.xml} | 0 ...raphics-listen-back-compat.xml =3D> graphics-listen-back-compat.xml} | 0 ...ics-vnc-listen-attr-only.xml =3D> graphics-vnc-listen-attr-only.xml} | 0 ...en-element-minimal.xml =3D> graphics-vnc-listen-element-minimal.xml} | 0 ...-with-address.xml =3D> graphics-vnc-listen-element-with-address.xml} | 0 ...eric-graphics-vnc-manual-port.xml =3D> graphics-vnc-manual-port.xml} | 0 .../{generic-graphics-vnc-minimal.xml =3D> graphics-vnc-minimal.xml} | 0 ...listen-address.xml =3D> graphics-vnc-socket-attr-listen-address.xml} | 0 ...r-listen-socket.xml =3D> graphics-vnc-socket-attr-listen-socket.xml} | 0 ...-graphics-vnc-socket-listen.xml =3D> graphics-vnc-socket-listen.xml} | 0 .../{generic-graphics-vnc-socket.xml =3D> graphics-vnc-socket.xml} | 0 51 files changed, 2 insertions(+), 2 deletions(-) rename tests/genericxml2xmlindata/{generic-chardev-reconnect-invalid-mode.= xml =3D> chardev-reconnect-invalid-mode.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-reconnect-missing-timeo= ut.xml =3D> chardev-reconnect-missing-timeout.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-reconnect.xml =3D> char= dev-reconnect.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-tcp-missing-host.xml = =3D> chardev-tcp-missing-host.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-tcp-missing-service.xml= =3D> chardev-tcp-missing-service.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-tcp-multiple-source.xml= =3D> chardev-tcp-multiple-source.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-tcp.xml =3D> chardev-tc= p.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-udp-missing-connect-ser= vice.xml =3D> chardev-udp-missing-connect-service.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-udp-multiple-source.xml= =3D> chardev-udp-multiple-source.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-udp.xml =3D> chardev-ud= p.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-unix-redirdev-missing-p= ath.xml =3D> chardev-unix-redirdev-missing-path.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-unix-rng-missing-path.x= ml =3D> chardev-unix-rng-missing-path.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-unix-smartcard-missing-= path.xml =3D> chardev-unix-smartcard-missing-path.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-unix.xml =3D> chardev-u= nix.xml} (100%) rename tests/genericxml2xmlindata/{generic-cpu-cache-disable.xml =3D> cpu-= cache-disable.xml} (100%) rename tests/genericxml2xmlindata/{generic-cpu-cache-emulate.xml =3D> cpu-= cache-emulate.xml} (100%) rename tests/genericxml2xmlindata/{generic-cpu-cache-passthrough.xml =3D> = cpu-cache-passthrough.xml} (100%) rename tests/genericxml2xmlindata/{generic-disk-network-http.xml =3D> disk= -network-http.xml} (100%) rename tests/genericxml2xmlindata/{generic-disk-virtio.xml =3D> disk-virti= o.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-listen-back-compat-mis= match.xml =3D> graphics-listen-back-compat-mismatch.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-listen-back-compat.xml= =3D> graphics-listen-back-compat.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-autoport-no.xml = =3D> graphics-vnc-autoport-no.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-listen-attr-only.x= ml =3D> graphics-vnc-listen-attr-only.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-listen-element-min= imal.xml =3D> graphics-vnc-listen-element-minimal.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-listen-element-wit= h-address.xml =3D> graphics-vnc-listen-element-with-address.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-manual-port.xml = =3D> graphics-vnc-manual-port.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-minimal.xml =3D> g= raphics-vnc-minimal.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-socket-attr-listen= -address.xml =3D> graphics-vnc-socket-attr-listen-address.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-socket-attr-listen= -socket-mismatch.xml =3D> graphics-vnc-socket-attr-listen-socket-mismatch.x= ml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-socket-attr-listen= -socket.xml =3D> graphics-vnc-socket-attr-listen-socket.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-socket-listen.xml = =3D> graphics-vnc-socket-listen.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-socket.xml =3D> gr= aphics-vnc-socket.xml} (100%) rename tests/genericxml2xmlindata/{generic-name-slash-fail.xml =3D> name-s= lash-fail.xml} (100%) rename tests/genericxml2xmlindata/{generic-perf.xml =3D> perf.xml} (100%) rename tests/genericxml2xmlindata/{generic-vcpus-individual.xml =3D> vcpus= -individual.xml} (100%) rename tests/genericxml2xmloutdata/{generic-chardev-reconnect.xml =3D> cha= rdev-reconnect.xml} (100%) rename tests/genericxml2xmloutdata/{generic-chardev-tcp.xml =3D> chardev-t= cp.xml} (100%) rename tests/genericxml2xmloutdata/{generic-chardev-udp.xml =3D> chardev-u= dp.xml} (100%) rename tests/genericxml2xmloutdata/{generic-chardev-unix.xml =3D> chardev-= unix.xml} (100%) rename tests/genericxml2xmloutdata/{generic-disk-virtio.xml =3D> disk-virt= io.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-listen-back-compat.xm= l =3D> graphics-listen-back-compat.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-listen-attr-only.= xml =3D> graphics-vnc-listen-attr-only.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-listen-element-mi= nimal.xml =3D> graphics-vnc-listen-element-minimal.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-listen-element-wi= th-address.xml =3D> graphics-vnc-listen-element-with-address.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-manual-port.xml = =3D> graphics-vnc-manual-port.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-minimal.xml =3D> = graphics-vnc-minimal.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-socket-attr-liste= n-address.xml =3D> graphics-vnc-socket-attr-listen-address.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-socket-attr-liste= n-socket.xml =3D> graphics-vnc-socket-attr-listen-socket.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-socket-listen.xml= =3D> graphics-vnc-socket-listen.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-socket.xml =3D> g= raphics-vnc-socket.xml} (100%) diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index a0900d9db..deaf5bd9b 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -32,9 +32,9 @@ testCompareXMLToXMLHelper(const void *data) char *xml_out =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&xml_in, "%s/genericxml2xmlindata/generic-%s.xml", + if (virAsprintf(&xml_in, "%s/genericxml2xmlindata/%s.xml", abs_srcdir, info->name) < 0 || - virAsprintf(&xml_out, "%s/genericxml2xmloutdata/generic-%s.xml", + virAsprintf(&xml_out, "%s/genericxml2xmloutdata/%s.xml", abs_srcdir, info->name) < 0) goto cleanup; =20 diff --git a/tests/genericxml2xmlindata/generic-chardev-reconnect-invalid-m= ode.xml b/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-reconnect-invalid-mo= de.xml rename to tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list