if (fakeHostCPU(domCaps->arch) < 0)
return -1;
- path = g_strdup_printf("%s/%s.%s.xml", TEST_QEMU_CAPS_PATH, name, arch);
+ path = g_strdup_printf("%s/%s_%s.xml", TEST_QEMU_CAPS_PATH, name, arch);
if (!(qemuCaps = qemuTestParseCapabilitiesArch(domCaps->arch, path)))
return -1;
const char *suffix,
void *opaque G_GNUC_UNUSED)
{
- g_autofree char *repliesFile = g_strdup_printf("%s/%s_%s.%s.%s", inputDir, prefix, version, archName, suffix);
+ g_autofree char *repliesFile = g_strdup_printf("%s/%s_%s_%s.%s", inputDir, prefix, version, archName, suffix);
return virTestRun(repliesFile, testCapsFile, repliesFile);
}
unsigned int fakeMicrocodeVersion = 0;
const char *p;
- repliesFile = g_strdup_printf("%s/%s_%s.%s.%s",
+ repliesFile = g_strdup_printf("%s/%s_%s_%s.%s",
data->inputDir, data->prefix, data->version,
data->archName, data->suffix);
- capsFile = g_strdup_printf("%s/%s_%s.%s.xml",
+ capsFile = g_strdup_printf("%s/%s_%s_%s.xml",
data->outputDir, data->prefix, data->version,
data->archName);
g_autoptr(virQEMUCaps) copy = NULL;
g_autofree char *actual = NULL;
- capsFile = g_strdup_printf("%s/%s_%s.%s.xml",
+ capsFile = g_strdup_printf("%s/%s_%s_%s.xml",
data->outputDir, data->prefix, data->version,
data->archName);
xmlFile = g_strdup_printf("%s/caps.%s.xml", data->outputDir, data->archName);
- capsFile = g_strdup_printf("%s/%s_%s.%s.%s",
+ capsFile = g_strdup_printf("%s/%s_%s_%s.%s",
data->inputDir, data->prefix, data->version,
data->archName, data->suffix);
return -1;
}
- /* Find the last dot */
- if (!(archName = strrchr(tmp, '.'))) {
+ /* Find the underscore separating version from arch */
+ if (!(archName = strchr(version, '_'))) {
VIR_TEST_VERBOSE("malformed file name '%s'", ent->d_name);
return -1;
}
/* The version number and the architecture name are separated by
- * a dot: overwriting that dot with \0 results in both being usable
- * as independent, null-terminated strings */
+ * a underscore: overwriting that underscore with \0 results in both
+ * being usable as independent, null-terminated strings */
archName[0] = '\0';
archName++;
stripmachinealiases = true;
} else {
- capsfile = g_strdup_printf("%s/caps_%s.%s.xml",
+ capsfile = g_strdup_printf("%s/caps_%s_%s.xml",
TEST_QEMU_CAPS_PATH,
info->args.capsver,
info->args.capsarch);
projects / thirdparty / libvirt.git / commitdiff
