5:42 a.m.
The usual convention is to use ${foo}test.c for the test program
itself and either ${foo}data/ or ${foo}outdata/, depending on
whether it contains both input and output files or only the latter,
for the corresponding data directory.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
tests/Makefile.am | 2 +-
.../bhyve_basic.x86_64.xml | 0
.../bhyve_fbuf.x86_64.xml | 0
.../bhyve_uefi.x86_64.xml | 0
tests/{domaincapsschemadata => domaincapsdata}/empty.xml | 0
tests/{domaincapsschemadata => domaincapsdata}/libxl-xenfv.xml | 0
tests/{domaincapsschemadata => domaincapsdata}/libxl-xenpv.xml | 0
.../qemu_1.7.0.x86_64.xml | 0
.../qemu_2.12.0-virt.aarch64.xml | 0
.../qemu_2.12.0.ppc64.xml | 0
.../qemu_2.12.0.s390x.xml | 0
.../qemu_2.12.0.x86_64.xml | 0
.../qemu_2.6.0-virt.aarch64.xml | 0
.../qemu_2.6.0.aarch64.xml | 0
.../qemu_2.6.0.ppc64.xml | 0
.../qemu_2.6.0.x86_64.xml | 0
.../qemu_2.7.0.s390x.xml | 0
.../qemu_2.8.0-tcg.x86_64.xml | 0
.../qemu_2.8.0.s390x.xml | 0
.../qemu_2.8.0.x86_64.xml | 0
.../qemu_2.9.0-q35.x86_64.xml | 0
.../qemu_2.9.0-tcg.x86_64.xml | 0
.../qemu_2.9.0.x86_64.xml | 0
.../qemu_3.0.0.s390x.xml | 0
.../qemu_3.1.0.x86_64.xml | 0
.../qemu_4.0.0.s390x.xml | 0
.../qemu_4.0.0.x86_64.xml | 0
.../qemu_4.1.0.x86_64.xml | 0
.../qemu_4.2.0.aarch64.xml | 0
.../qemu_4.2.0.ppc64.xml | 0
.../qemu_4.2.0.x86_64.xml | 0
tests/domaincapstest.c | 2 +-
tests/virschematest.c | 2 +-
33 files changed, 3 insertions(+), 3 deletions(-)
rename tests/{domaincapsschemadata => domaincapsdata}/bhyve_basic.x86_64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/bhyve_fbuf.x86_64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/bhyve_uefi.x86_64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/empty.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/libxl-xenfv.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/libxl-xenpv.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_1.7.0.x86_64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.12.0-virt.aarch64.xml
(100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.12.0.ppc64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.12.0.s390x.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.12.0.x86_64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.6.0-virt.aarch64.xml
(100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.6.0.aarch64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.6.0.ppc64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.6.0.x86_64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.7.0.s390x.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.8.0-tcg.x86_64.xml
(100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.8.0.s390x.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.8.0.x86_64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.9.0-q35.x86_64.xml
(100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.9.0-tcg.x86_64.xml
(100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_2.9.0.x86_64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_3.0.0.s390x.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_3.1.0.x86_64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_4.0.0.s390x.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_4.0.0.x86_64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_4.1.0.x86_64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_4.2.0.aarch64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_4.2.0.ppc64.xml (100%)
rename tests/{domaincapsschemadata => domaincapsdata}/qemu_4.2.0.x86_64.xml (100%)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a9acd88670..10a309bd76 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -89,7 +89,7 @@ EXTRA_DIST = \
capabilityschemadata \
commanddata \
cputestdata \
- domaincapsschemadata \
+ domaincapsdata \
domainconfdata \
domainschemadata \
fchostdata \
diff --git a/tests/domaincapsschemadata/bhyve_basic.x86_64.xml
b/tests/domaincapsdata/bhyve_basic.x86_64.xml
similarity index 100%
rename from tests/domaincapsschemadata/bhyve_basic.x86_64.xml
rename to tests/domaincapsdata/bhyve_basic.x86_64.xml
[... many more files get moved ...]
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 61bc019671..7a69543a45 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -217,7 +217,7 @@ test_virDomainCapsFormat(const void *opaque)
char *domCapsXML = NULL;
int ret = -1;
- if (virAsprintf(&path, "%s/domaincapsschemadata/%s.xml",
+ if (virAsprintf(&path, "%s/domaincapsdata/%s.xml",
abs_srcdir, data->name) < 0)
goto cleanup;
diff --git a/tests/virschematest.c b/tests/virschematest.c
index dabbc02163..050da0c972 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -221,7 +221,7 @@ mymain(void)
"lxcxml2xmloutdata", "bhyvexml2argvdata",
"genericxml2xmlindata",
"genericxml2xmloutdata", "xlconfigdata",
"libxlxml2domconfigdata",
"qemuhotplugtestdomains");
- DO_TEST_DIR("domaincaps.rng", "domaincapsschemadata");
+ DO_TEST_DIR("domaincaps.rng", "domaincapsdata");
DO_TEST_DIR("domaincheckpoint.rng",
"qemudomaincheckpointxml2xmlin",
"qemudomaincheckpointxml2xmlout");
DO_TEST_DIR("domainsnapshot.rng", "qemudomainsnapshotxml2xmlin",
--
2.21.0