mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-06 09:55:46 +00:00
snapshot: Rename qemu domain snapshot test files
Make it obvious that the domainsnapshotxml2xml test is only run when compiling in support for qemu. Suggested-by: Peter Krempa <pkrempa@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com> Acked-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
parent
9a04cad07d
commit
4d91ad1c59
@ -85,8 +85,6 @@ EXTRA_DIST = \
|
|||||||
domaincapsschemadata \
|
domaincapsschemadata \
|
||||||
domainconfdata \
|
domainconfdata \
|
||||||
domainschemadata \
|
domainschemadata \
|
||||||
domainsnapshotxml2xmlin \
|
|
||||||
domainsnapshotxml2xmlout \
|
|
||||||
fchostdata \
|
fchostdata \
|
||||||
genericxml2xmlindata \
|
genericxml2xmlindata \
|
||||||
genericxml2xmloutdata \
|
genericxml2xmloutdata \
|
||||||
@ -112,6 +110,8 @@ EXTRA_DIST = \
|
|||||||
qemublocktestdata \
|
qemublocktestdata \
|
||||||
qemucapabilitiesdata \
|
qemucapabilitiesdata \
|
||||||
qemucaps2xmloutdata \
|
qemucaps2xmloutdata \
|
||||||
|
qemudomainsnapshotxml2xmlin \
|
||||||
|
qemudomainsnapshotxml2xmlout \
|
||||||
qemuhotplugtestcpus \
|
qemuhotplugtestcpus \
|
||||||
qemuhotplugtestdevices \
|
qemuhotplugtestdevices \
|
||||||
qemuhotplugtestdomains \
|
qemuhotplugtestdomains \
|
||||||
@ -275,7 +275,7 @@ endif WITH_LIBXL
|
|||||||
|
|
||||||
if WITH_QEMU
|
if WITH_QEMU
|
||||||
test_programs += qemuxml2argvtest qemuxml2xmltest \
|
test_programs += qemuxml2argvtest qemuxml2xmltest \
|
||||||
domainsnapshotxml2xmltest \
|
qemudomainsnapshotxml2xmltest \
|
||||||
qemumonitorjsontest qemuhotplugtest \
|
qemumonitorjsontest qemuhotplugtest \
|
||||||
qemuagenttest qemucapabilitiestest qemucaps2xmltest \
|
qemuagenttest qemucapabilitiestest qemucaps2xmltest \
|
||||||
qemumemlocktest \
|
qemumemlocktest \
|
||||||
@ -656,10 +656,10 @@ qemublocktest_LDADD = \
|
|||||||
$(qemu_LDADDS) \
|
$(qemu_LDADDS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
domainsnapshotxml2xmltest_SOURCES = \
|
qemudomainsnapshotxml2xmltest_SOURCES = \
|
||||||
domainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \
|
qemudomainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS)
|
qemudomainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS)
|
||||||
|
|
||||||
qemumemlocktest_SOURCES = \
|
qemumemlocktest_SOURCES = \
|
||||||
qemumemlocktest.c \
|
qemumemlocktest.c \
|
||||||
@ -691,7 +691,7 @@ qemufirmwaretest_LDADD = $(qemu_LDADDS)
|
|||||||
|
|
||||||
else ! WITH_QEMU
|
else ! WITH_QEMU
|
||||||
EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c \
|
EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c \
|
||||||
domainsnapshotxml2xmltest.c \
|
qemudomainsnapshotxml2xmltest.c \
|
||||||
testutilsqemu.c testutilsqemu.h \
|
testutilsqemu.c testutilsqemu.h \
|
||||||
testutilsqemuschema.c testutilsqemuschema.h \
|
testutilsqemuschema.c testutilsqemuschema.h \
|
||||||
qemumonitorjsontest.c qemuhotplugtest.c \
|
qemumonitorjsontest.c qemuhotplugtest.c \
|
||||||
|
@ -144,18 +144,18 @@ mymain(void)
|
|||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
# define DO_TEST_IN(name, uuid) DO_TEST("in->in", name, \
|
# define DO_TEST_IN(name, uuid) DO_TEST("in->in", name, \
|
||||||
"domainsnapshotxml2xmlin", \
|
"qemudomainsnapshotxml2xmlin", \
|
||||||
"domainsnapshotxml2xmlin", \
|
"qemudomainsnapshotxml2xmlin", \
|
||||||
uuid, 0, 0)
|
uuid, 0, 0)
|
||||||
|
|
||||||
# define DO_TEST_OUT(name, uuid, internal) \
|
# define DO_TEST_OUT(name, uuid, internal) \
|
||||||
DO_TEST("out->out", name, "domainsnapshotxml2xmlout", \
|
DO_TEST("out->out", name, "qemudomainsnapshotxml2xmlout", \
|
||||||
"domainsnapshotxml2xmlout", uuid, 0, internal | TEST_REDEFINE)
|
"qemudomainsnapshotxml2xmlout", uuid, 0, internal | TEST_REDEFINE)
|
||||||
|
|
||||||
# define DO_TEST_INOUT(name, uuid, time, flags) \
|
# define DO_TEST_INOUT(name, uuid, time, flags) \
|
||||||
DO_TEST("in->out", name, \
|
DO_TEST("in->out", name, \
|
||||||
"domainsnapshotxml2xmlin",\
|
"qemudomainsnapshotxml2xmlin",\
|
||||||
"domainsnapshotxml2xmlout",\
|
"qemudomainsnapshotxml2xmlout",\
|
||||||
uuid, time, flags)
|
uuid, time, flags)
|
||||||
|
|
||||||
/* Unset or set all envvars here that are copied in qemudBuildCommandLine
|
/* Unset or set all envvars here that are copied in qemudBuildCommandLine
|
@ -222,8 +222,8 @@ mymain(void)
|
|||||||
"genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconfigdata",
|
"genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconfigdata",
|
||||||
"qemuhotplugtestdomains");
|
"qemuhotplugtestdomains");
|
||||||
DO_TEST_DIR("domaincaps.rng", "domaincapsschemadata");
|
DO_TEST_DIR("domaincaps.rng", "domaincapsschemadata");
|
||||||
DO_TEST_DIR("domainsnapshot.rng", "domainsnapshotxml2xmlin",
|
DO_TEST_DIR("domainsnapshot.rng", "qemudomainsnapshotxml2xmlin",
|
||||||
"domainsnapshotxml2xmlout");
|
"qemudomainsnapshotxml2xmlout");
|
||||||
DO_TEST_DIR("interface.rng", "interfaceschemadata");
|
DO_TEST_DIR("interface.rng", "interfaceschemadata");
|
||||||
DO_TEST_DIR("network.rng", "../src/network", "networkxml2xmlin",
|
DO_TEST_DIR("network.rng", "../src/network", "networkxml2xmlin",
|
||||||
"networkxml2xmlout", "networkxml2confdata");
|
"networkxml2xmlout", "networkxml2confdata");
|
||||||
|
Loading…
Reference in New Issue
Block a user