Make it obvious that the domainsnapshotxml2xml test is only run when
compiling in support for qemu.
Suggested-by: Peter Krempa <pkrempa@xxxxxxxxxx>
Signed-off-by: Eric Blake <eblake@xxxxxxxxxx>
---
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 => qemudomainsnapshotxml2xmltest.c} | 12 ++++++------
tests/virschematest.c | 4 ++--
28 files changed, 15 insertions(+), 15 deletions(-)
rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/description_only.xml (100%)
rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/disk-invalid.xml (100%)
rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/disk-network-seclabel-invalid.xml (100%)
rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/disk-seclabel.xml (100%)
rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/disk_driver_name_null.xml (100%)
rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/disk_snapshot.xml (100%)
rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/empty.xml (100%)
rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/external_vm.xml (100%)
rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/name_and_description.xml (100%)
rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/name_only.xml (100%)
rename tests/{domainsnapshotxml2xmlin => qemudomainsnapshotxml2xmlin}/noparent.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/all_parameters.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/disk-seclabel.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/disk_driver_name_null.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/disk_snapshot.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/disk_snapshot_redefine.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/empty.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/external_vm.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/external_vm_redefine.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/full_domain.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/metadata.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/name_and_description.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/noparent.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/noparent_nodescription.xml (100%)
rename tests/{domainsnapshotxml2xmlout => qemudomainsnapshotxml2xmlout}/noparent_nodescription_noactive.xml (100%)
rename tests/{domainsnapshotxml2xmltest.c => qemudomainsnapshotxml2xmltest.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 = \
domaincapsschemadata \
domainconfdata \
domainschemadata \
- domainsnapshotxml2xmlin \
- domainsnapshotxml2xmlout \
fchostdata \
genericxml2xmlindata \
genericxml2xmloutdata \
@@ -112,6 +110,8 @@ EXTRA_DIST = \
qemublocktestdata \
qemucapabilitiesdata \
qemucaps2xmloutdata \
+ qemudomainsnapshotxml2xmlin \
+ qemudomainsnapshotxml2xmlout \
qemuhotplugtestcpus \
qemuhotplugtestdevices \
qemuhotplugtestdomains \
@@ -275,7 +275,7 @@ endif WITH_LIBXL
if WITH_QEMU
test_programs += qemuxml2argvtest qemuxml2xmltest \
- domainsnapshotxml2xmltest \
+ qemudomainsnapshotxml2xmltest \
qemumonitorjsontest qemuhotplugtest \
qemuagenttest qemucapabilitiestest qemucaps2xmltest \
qemumemlocktest \
@@ -656,10 +656,10 @@ qemublocktest_LDADD = \
$(qemu_LDADDS) \
$(NULL)
-domainsnapshotxml2xmltest_SOURCES = \
- domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \
+qemudomainsnapshotxml2xmltest_SOURCES = \
+ qemudomainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \
testutils.c testutils.h
-domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS)
+qemudomainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS)
qemumemlocktest_SOURCES = \
qemumemlocktest.c \
@@ -691,7 +691,7 @@ qemufirmwaretest_LDADD = $(qemu_LDADDS)
else ! WITH_QEMU
EXTRA_DIST += 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/qemudomainsnapshotxml2xmlin/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/qemudomainsnapshotxml2xmlin/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.xml 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.xml
diff --git a/tests/domainsnapshotxml2xmlin/disk-seclabel.xml b/tests/qemudomainsnapshotxml2xmlin/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/tests/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/qemudomainsnapshotxml2xmlin/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/qemudomainsnapshotxml2xmlin/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/qemudomainsnapshotxml2xmlin/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/qemudomainsnapshotxml2xmlin/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/qemudomainsnapshotxml2xmlin/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/qemudomainsnapshotxml2xmlout/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/qemudomainsnapshotxml2xmlout/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/tests/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/qemudomainsnapshotxml2xmlout/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/tests/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/qemudomainsnapshotxml2xmlout/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/qemudomainsnapshotxml2xmlout/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/tests/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/qemudomainsnapshotxml2xmlout/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/qemudomainsnapshotxml2xmlout/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/tests/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/qemudomainsnapshotxml2xmlout/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/tests/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.xml
similarity index 100%
rename from tests/domainsnapshotxml2xmlout/noparent_nodescription_noactive.xml
rename to tests/qemudomainsnapshotxml2xmlout/noparent_nodescription_noactive.xml
diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxml2xmltest.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_REDEFINE)
# 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 qemudBuildCommandLine
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", "libxlxml2domconfigdata",
"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");
--
2.20.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
