[libvirt] [PATCH 4/4] test: Drop useless prefix for genericxml2xml test data

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 <mprivozn(a)redhat.com&gt; --- tests/genericxml2xmltest.c | 4 ++-- ...-reconnect-invalid-mode.xml => chardev-reconnect-invalid-mode.xml} | 0 ...nect-missing-timeout.xml => chardev-reconnect-missing-timeout.xml} | 0 .../{generic-chardev-reconnect.xml => chardev-reconnect.xml} | 0 ...eric-chardev-tcp-missing-host.xml => chardev-tcp-missing-host.xml} | 0 ...hardev-tcp-missing-service.xml => chardev-tcp-missing-service.xml} | 0 ...hardev-tcp-multiple-source.xml => chardev-tcp-multiple-source.xml} | 0 .../genericxml2xmlindata/{generic-chardev-tcp.xml => chardev-tcp.xml} | 0 ...ng-connect-service.xml => chardev-udp-missing-connect-service.xml} | 0 ...hardev-udp-multiple-source.xml => chardev-udp-multiple-source.xml} | 0 .../genericxml2xmlindata/{generic-chardev-udp.xml => chardev-udp.xml} | 0 ...dirdev-missing-path.xml => chardev-unix-redirdev-missing-path.xml} | 0 ...ev-unix-rng-missing-path.xml => chardev-unix-rng-missing-path.xml} | 0 ...tcard-missing-path.xml => chardev-unix-smartcard-missing-path.xml} | 0 .../{generic-chardev-unix.xml => chardev-unix.xml} | 0 .../{generic-cpu-cache-disable.xml => cpu-cache-disable.xml} | 0 .../{generic-cpu-cache-emulate.xml => cpu-cache-emulate.xml} | 0 .../{generic-cpu-cache-passthrough.xml => cpu-cache-passthrough.xml} | 0 .../{generic-disk-network-http.xml => disk-network-http.xml} | 0 .../genericxml2xmlindata/{generic-disk-virtio.xml => disk-virtio.xml} | 0 ...k-compat-mismatch.xml => graphics-listen-back-compat-mismatch.xml} | 0 ...raphics-listen-back-compat.xml => graphics-listen-back-compat.xml} | 0 ...eric-graphics-vnc-autoport-no.xml => graphics-vnc-autoport-no.xml} | 0 ...ics-vnc-listen-attr-only.xml => graphics-vnc-listen-attr-only.xml} | 0 ...en-element-minimal.xml => graphics-vnc-listen-element-minimal.xml} | 0 ...-with-address.xml => graphics-vnc-listen-element-with-address.xml} | 0 ...eric-graphics-vnc-manual-port.xml => graphics-vnc-manual-port.xml} | 0 .../{generic-graphics-vnc-minimal.xml => graphics-vnc-minimal.xml} | 0 ...listen-address.xml => graphics-vnc-socket-attr-listen-address.xml} | 0 ...smatch.xml => graphics-vnc-socket-attr-listen-socket-mismatch.xml} | 0 ...r-listen-socket.xml => graphics-vnc-socket-attr-listen-socket.xml} | 0 ...-graphics-vnc-socket-listen.xml => graphics-vnc-socket-listen.xml} | 0 .../{generic-graphics-vnc-socket.xml => graphics-vnc-socket.xml} | 0 .../{generic-name-slash-fail.xml => name-slash-fail.xml} | 0 tests/genericxml2xmlindata/{generic-perf.xml => perf.xml} | 0 .../{generic-vcpus-individual.xml => vcpus-individual.xml} | 0 .../{generic-chardev-reconnect.xml => chardev-reconnect.xml} | 0 .../{generic-chardev-tcp.xml => chardev-tcp.xml} | 0 .../{generic-chardev-udp.xml => chardev-udp.xml} | 0 .../{generic-chardev-unix.xml => chardev-unix.xml} | 0 .../{generic-disk-virtio.xml => disk-virtio.xml} | 0 ...raphics-listen-back-compat.xml => graphics-listen-back-compat.xml} | 0 ...ics-vnc-listen-attr-only.xml => graphics-vnc-listen-attr-only.xml} | 0 ...en-element-minimal.xml => graphics-vnc-listen-element-minimal.xml} | 0 ...-with-address.xml => graphics-vnc-listen-element-with-address.xml} | 0 ...eric-graphics-vnc-manual-port.xml => graphics-vnc-manual-port.xml} | 0 .../{generic-graphics-vnc-minimal.xml => graphics-vnc-minimal.xml} | 0 ...listen-address.xml => graphics-vnc-socket-attr-listen-address.xml} | 0 ...r-listen-socket.xml => graphics-vnc-socket-attr-listen-socket.xml} | 0 ...-graphics-vnc-socket-listen.xml => graphics-vnc-socket-listen.xml} | 0 .../{generic-graphics-vnc-socket.xml => graphics-vnc-socket.xml} | 0 51 files changed, 2 insertions(+), 2 deletions(-) rename tests/genericxml2xmlindata/{generic-chardev-reconnect-invalid-mode.xml => chardev-reconnect-invalid-mode.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-reconnect-missing-timeout.xml => chardev-reconnect-missing-timeout.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-reconnect.xml => chardev-reconnect.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-tcp-missing-host.xml => chardev-tcp-missing-host.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-tcp-missing-service.xml => chardev-tcp-missing-service.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-tcp-multiple-source.xml => chardev-tcp-multiple-source.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-tcp.xml => chardev-tcp.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-udp-missing-connect-service.xml => chardev-udp-missing-connect-service.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-udp-multiple-source.xml => chardev-udp-multiple-source.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-udp.xml => chardev-udp.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-unix-redirdev-missing-path.xml => chardev-unix-redirdev-missing-path.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-unix-rng-missing-path.xml => chardev-unix-rng-missing-path.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-unix-smartcard-missing-path.xml => chardev-unix-smartcard-missing-path.xml} (100%) rename tests/genericxml2xmlindata/{generic-chardev-unix.xml => chardev-unix.xml} (100%) rename tests/genericxml2xmlindata/{generic-cpu-cache-disable.xml => cpu-cache-disable.xml} (100%) rename tests/genericxml2xmlindata/{generic-cpu-cache-emulate.xml => cpu-cache-emulate.xml} (100%) rename tests/genericxml2xmlindata/{generic-cpu-cache-passthrough.xml => cpu-cache-passthrough.xml} (100%) rename tests/genericxml2xmlindata/{generic-disk-network-http.xml => disk-network-http.xml} (100%) rename tests/genericxml2xmlindata/{generic-disk-virtio.xml => disk-virtio.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-listen-back-compat-mismatch.xml => graphics-listen-back-compat-mismatch.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-listen-back-compat.xml => graphics-listen-back-compat.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-autoport-no.xml => graphics-vnc-autoport-no.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-listen-attr-only.xml => graphics-vnc-listen-attr-only.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-listen-element-minimal.xml => graphics-vnc-listen-element-minimal.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-listen-element-with-address.xml => graphics-vnc-listen-element-with-address.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-manual-port.xml => graphics-vnc-manual-port.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-minimal.xml => graphics-vnc-minimal.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-socket-attr-listen-address.xml => graphics-vnc-socket-attr-listen-address.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml => graphics-vnc-socket-attr-listen-socket-mismatch.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-socket-attr-listen-socket.xml => graphics-vnc-socket-attr-listen-socket.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-socket-listen.xml => graphics-vnc-socket-listen.xml} (100%) rename tests/genericxml2xmlindata/{generic-graphics-vnc-socket.xml => graphics-vnc-socket.xml} (100%) rename tests/genericxml2xmlindata/{generic-name-slash-fail.xml => name-slash-fail.xml} (100%) rename tests/genericxml2xmlindata/{generic-perf.xml => perf.xml} (100%) rename tests/genericxml2xmlindata/{generic-vcpus-individual.xml => vcpus-individual.xml} (100%) rename tests/genericxml2xmloutdata/{generic-chardev-reconnect.xml => chardev-reconnect.xml} (100%) rename tests/genericxml2xmloutdata/{generic-chardev-tcp.xml => chardev-tcp.xml} (100%) rename tests/genericxml2xmloutdata/{generic-chardev-udp.xml => chardev-udp.xml} (100%) rename tests/genericxml2xmloutdata/{generic-chardev-unix.xml => chardev-unix.xml} (100%) rename tests/genericxml2xmloutdata/{generic-disk-virtio.xml => disk-virtio.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-listen-back-compat.xml => graphics-listen-back-compat.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-listen-attr-only.xml => graphics-vnc-listen-attr-only.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-listen-element-minimal.xml => graphics-vnc-listen-element-minimal.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-listen-element-with-address.xml => graphics-vnc-listen-element-with-address.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-manual-port.xml => graphics-vnc-manual-port.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-minimal.xml => graphics-vnc-minimal.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-socket-attr-listen-address.xml => graphics-vnc-socket-attr-listen-address.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-socket-attr-listen-socket.xml => graphics-vnc-socket-attr-listen-socket.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-socket-listen.xml => graphics-vnc-socket-listen.xml} (100%) rename tests/genericxml2xmloutdata/{generic-graphics-vnc-socket.xml => graphics-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 = NULL; int ret = -1; - 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; diff --git a/tests/genericxml2xmlindata/generic-chardev-reconnect-invalid-mode.xml b/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-reconnect-invalid-mode.xml rename to tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml <snip/> -- 2.13.6