qemuxmlconftest: Move data directory 'qemuxml2argvdata' to 'qemuxmlconfdata'

Unify the naming of the data directory with the test name.

'tests/qemuxml2argvdata' is for the time converted to a symlink to
'qemuxmlconfdata', to preserve the symlinks in
'tests/qemuxml2xmloutdata'

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Peter Krempa 2024-01-22 13:18:56 +01:00
parent 4702d40aa0
commit fb6b391672
2360 changed files with 12 additions and 11 deletions

View File

@ -129,7 +129,7 @@ typedef enum {
static void static void
testInfoSetPaths(TestInfo *info) testInfoSetPaths(TestInfo *info)
{ {
info->infile = g_strdup_printf("%s/qemuxml2argvdata/%s.xml", info->infile = g_strdup_printf("%s/qemuxmlconfdata/%s.xml",
abs_srcdir, info->name); abs_srcdir, info->name);
info->outtemplate = g_strdup_printf("%s/qemunbdkitdata/%s", info->outtemplate = g_strdup_printf("%s/qemunbdkitdata/%s",
abs_srcdir, info->name); abs_srcdir, info->name);

View File

@ -31,7 +31,7 @@
struct testData { struct testData {
virQEMUDriver *driver; virQEMUDriver *driver;
const char *file; /* file name to load VM def XML from; qemuxml2argvdata/ */ const char *file; /* file name to load VM def XML from; qemuxmlconfdata/ */
}; };
@ -46,7 +46,7 @@ prepareObjects(virQEMUDriver *driver,
g_autofree char *domxml = NULL; g_autofree char *domxml = NULL;
g_autofree char *latestCapsFile = NULL; g_autofree char *latestCapsFile = NULL;
filename = g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_srcdir, xmlname); filename = g_strdup_printf("%s/qemuxmlconfdata/%s.xml", abs_srcdir, xmlname);
if (virTestLoadFile(filename, &domxml) < 0) if (virTestLoadFile(filename, &domxml) < 0)
return -1; return -1;

1
tests/qemuxml2argvdata Symbolic link
View File

@ -0,0 +1 @@
qemuxmlconfdata/

View File

@ -175,7 +175,7 @@ testRunActive(const char *name,
testQemuInfoSetArgs(info, ap); testQemuInfoSetArgs(info, ap);
va_end(ap); va_end(ap);
info->infile = g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_srcdir, info->infile = g_strdup_printf("%s/qemuxmlconfdata/%s.xml", abs_srcdir,
info->name); info->name);
info->out_xml_active = g_strdup_printf("%s/qemuxmlactive2xmldata/%s-active%s.xml", info->out_xml_active = g_strdup_printf("%s/qemuxmlactive2xmldata/%s-active%s.xml",

Some files were not shown because too many files have changed in this diff Show More