From ab7a2fe230bb742cc4bc7f8d1475201b97fe49ab Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 5 Dec 2017 08:00:41 +0100 Subject: [PATCH] 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 --- ...ct-invalid-mode.xml => chardev-reconnect-invalid-mode.xml} | 0 ...sing-timeout.xml => chardev-reconnect-missing-timeout.xml} | 0 .../{generic-chardev-reconnect.xml => chardev-reconnect.xml} | 0 ...rdev-tcp-missing-host.xml => chardev-tcp-missing-host.xml} | 0 ...cp-missing-service.xml => chardev-tcp-missing-service.xml} | 0 ...cp-multiple-source.xml => chardev-tcp-multiple-source.xml} | 0 .../{generic-chardev-tcp.xml => chardev-tcp.xml} | 0 ...ct-service.xml => chardev-udp-missing-connect-service.xml} | 0 ...dp-multiple-source.xml => chardev-udp-multiple-source.xml} | 0 .../{generic-chardev-udp.xml => chardev-udp.xml} | 0 ...issing-path.xml => chardev-unix-redirdev-missing-path.xml} | 0 ...rng-missing-path.xml => chardev-unix-rng-missing-path.xml} | 0 ...ssing-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 ...ic-cpu-cache-passthrough.xml => cpu-cache-passthrough.xml} | 0 .../{generic-disk-network-http.xml => disk-network-http.xml} | 0 .../{generic-disk-virtio.xml => disk-virtio.xml} | 0 ...-mismatch.xml => graphics-listen-back-compat-mismatch.xml} | 0 ...listen-back-compat.xml => graphics-listen-back-compat.xml} | 0 ...phics-vnc-autoport-no.xml => graphics-vnc-autoport-no.xml} | 0 ...listen-attr-only.xml => graphics-vnc-listen-attr-only.xml} | 0 ...nt-minimal.xml => graphics-vnc-listen-element-minimal.xml} | 0 ...dress.xml => graphics-vnc-listen-element-with-address.xml} | 0 ...phics-vnc-manual-port.xml => graphics-vnc-manual-port.xml} | 0 ...eric-graphics-vnc-minimal.xml => graphics-vnc-minimal.xml} | 0 ...ddress.xml => graphics-vnc-socket-attr-listen-address.xml} | 0 ...ml => graphics-vnc-socket-attr-listen-socket-mismatch.xml} | 0 ...-socket.xml => graphics-vnc-socket-attr-listen-socket.xml} | 0 ...s-vnc-socket-listen.xml => graphics-vnc-socket-listen.xml} | 0 ...eneric-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 ...listen-back-compat.xml => graphics-listen-back-compat.xml} | 0 ...listen-attr-only.xml => graphics-vnc-listen-attr-only.xml} | 0 ...nt-minimal.xml => graphics-vnc-listen-element-minimal.xml} | 0 ...dress.xml => graphics-vnc-listen-element-with-address.xml} | 0 ...phics-vnc-manual-port.xml => graphics-vnc-manual-port.xml} | 0 ...eric-graphics-vnc-minimal.xml => graphics-vnc-minimal.xml} | 0 ...ddress.xml => graphics-vnc-socket-attr-listen-address.xml} | 0 ...-socket.xml => graphics-vnc-socket-attr-listen-socket.xml} | 0 ...s-vnc-socket-listen.xml => graphics-vnc-socket-listen.xml} | 0 ...eneric-graphics-vnc-socket.xml => graphics-vnc-socket.xml} | 0 tests/genericxml2xmltest.c | 4 ++-- 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/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 diff --git a/tests/genericxml2xmlindata/generic-chardev-reconnect-missing-timeout.xml b/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-reconnect-missing-timeout.xml rename to tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-reconnect.xml b/tests/genericxml2xmlindata/chardev-reconnect.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-reconnect.xml rename to tests/genericxml2xmlindata/chardev-reconnect.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-tcp-missing-host.xml b/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-tcp-missing-host.xml rename to tests/genericxml2xmlindata/chardev-tcp-missing-host.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-tcp-missing-service.xml b/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-tcp-missing-service.xml rename to tests/genericxml2xmlindata/chardev-tcp-missing-service.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-tcp-multiple-source.xml b/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-tcp-multiple-source.xml rename to tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-tcp.xml b/tests/genericxml2xmlindata/chardev-tcp.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-tcp.xml rename to tests/genericxml2xmlindata/chardev-tcp.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-udp-missing-connect-service.xml b/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-udp-missing-connect-service.xml rename to tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-udp-multiple-source.xml b/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-udp-multiple-source.xml rename to tests/genericxml2xmlindata/chardev-udp-multiple-source.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-udp.xml b/tests/genericxml2xmlindata/chardev-udp.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-udp.xml rename to tests/genericxml2xmlindata/chardev-udp.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-unix-redirdev-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-unix-redirdev-missing-path.xml rename to tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-unix-rng-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-unix-rng-missing-path.xml rename to tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-unix-smartcard-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-unix-smartcard-missing-path.xml rename to tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml diff --git a/tests/genericxml2xmlindata/generic-chardev-unix.xml b/tests/genericxml2xmlindata/chardev-unix.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-chardev-unix.xml rename to tests/genericxml2xmlindata/chardev-unix.xml diff --git a/tests/genericxml2xmlindata/generic-cpu-cache-disable.xml b/tests/genericxml2xmlindata/cpu-cache-disable.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-cpu-cache-disable.xml rename to tests/genericxml2xmlindata/cpu-cache-disable.xml diff --git a/tests/genericxml2xmlindata/generic-cpu-cache-emulate.xml b/tests/genericxml2xmlindata/cpu-cache-emulate.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-cpu-cache-emulate.xml rename to tests/genericxml2xmlindata/cpu-cache-emulate.xml diff --git a/tests/genericxml2xmlindata/generic-cpu-cache-passthrough.xml b/tests/genericxml2xmlindata/cpu-cache-passthrough.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-cpu-cache-passthrough.xml rename to tests/genericxml2xmlindata/cpu-cache-passthrough.xml diff --git a/tests/genericxml2xmlindata/generic-disk-network-http.xml b/tests/genericxml2xmlindata/disk-network-http.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-disk-network-http.xml rename to tests/genericxml2xmlindata/disk-network-http.xml diff --git a/tests/genericxml2xmlindata/generic-disk-virtio.xml b/tests/genericxml2xmlindata/disk-virtio.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-disk-virtio.xml rename to tests/genericxml2xmlindata/disk-virtio.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-listen-back-compat-mismatch.xml b/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-listen-back-compat-mismatch.xml rename to tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-listen-back-compat.xml b/tests/genericxml2xmlindata/graphics-listen-back-compat.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-listen-back-compat.xml rename to tests/genericxml2xmlindata/graphics-listen-back-compat.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml b/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml rename to tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-attr-only.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-vnc-listen-attr-only.xml rename to tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-minimal.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-minimal.xml rename to tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-with-address.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-with-address.xml rename to tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-manual-port.xml b/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-vnc-manual-port.xml rename to tests/genericxml2xmlindata/graphics-vnc-manual-port.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-minimal.xml b/tests/genericxml2xmlindata/graphics-vnc-minimal.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-vnc-minimal.xml rename to tests/genericxml2xmlindata/graphics-vnc-minimal.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml rename to tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml rename to tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml rename to tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-listen.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-vnc-socket-listen.xml rename to tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-socket.xml b/tests/genericxml2xmlindata/graphics-vnc-socket.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-graphics-vnc-socket.xml rename to tests/genericxml2xmlindata/graphics-vnc-socket.xml diff --git a/tests/genericxml2xmlindata/generic-name-slash-fail.xml b/tests/genericxml2xmlindata/name-slash-fail.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-name-slash-fail.xml rename to tests/genericxml2xmlindata/name-slash-fail.xml diff --git a/tests/genericxml2xmlindata/generic-perf.xml b/tests/genericxml2xmlindata/perf.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-perf.xml rename to tests/genericxml2xmlindata/perf.xml diff --git a/tests/genericxml2xmlindata/generic-vcpus-individual.xml b/tests/genericxml2xmlindata/vcpus-individual.xml similarity index 100% rename from tests/genericxml2xmlindata/generic-vcpus-individual.xml rename to tests/genericxml2xmlindata/vcpus-individual.xml diff --git a/tests/genericxml2xmloutdata/generic-chardev-reconnect.xml b/tests/genericxml2xmloutdata/chardev-reconnect.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-chardev-reconnect.xml rename to tests/genericxml2xmloutdata/chardev-reconnect.xml diff --git a/tests/genericxml2xmloutdata/generic-chardev-tcp.xml b/tests/genericxml2xmloutdata/chardev-tcp.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-chardev-tcp.xml rename to tests/genericxml2xmloutdata/chardev-tcp.xml diff --git a/tests/genericxml2xmloutdata/generic-chardev-udp.xml b/tests/genericxml2xmloutdata/chardev-udp.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-chardev-udp.xml rename to tests/genericxml2xmloutdata/chardev-udp.xml diff --git a/tests/genericxml2xmloutdata/generic-chardev-unix.xml b/tests/genericxml2xmloutdata/chardev-unix.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-chardev-unix.xml rename to tests/genericxml2xmloutdata/chardev-unix.xml diff --git a/tests/genericxml2xmloutdata/generic-disk-virtio.xml b/tests/genericxml2xmloutdata/disk-virtio.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-disk-virtio.xml rename to tests/genericxml2xmloutdata/disk-virtio.xml diff --git a/tests/genericxml2xmloutdata/generic-graphics-listen-back-compat.xml b/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-graphics-listen-back-compat.xml rename to tests/genericxml2xmloutdata/graphics-listen-back-compat.xml diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-attr-only.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-graphics-vnc-listen-attr-only.xml rename to tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-minimal.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-minimal.xml rename to tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-with-address.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-with-address.xml rename to tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-manual-port.xml b/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-graphics-vnc-manual-port.xml rename to tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-minimal.xml b/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-graphics-vnc-minimal.xml rename to tests/genericxml2xmloutdata/graphics-vnc-minimal.xml diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml rename to tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml rename to tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml rename to tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket.xml similarity index 100% rename from tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml rename to tests/genericxml2xmloutdata/graphics-vnc-socket.xml diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index a0900d9db7..deaf5bd9b8 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; -- GitLab