External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-06 17:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/qemucapabilities: Separate inputDir and outputDir

Browse Source 
We'll need this later.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Andrea Bolognani 2019-10-22 15:31:37 +02:00
parent b5bb62a64d
commit dea6c10946
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/qemucapabilitiestest.c
View File

@ -35,7 +35,8 @@ typedef struct _testQemuData testQemuData;
typedef testQemuData *testQemuDataPtr; typedef testQemuData *testQemuDataPtr;
struct _testQemuData { struct _testQemuData {
virQEMUDriver driver; virQEMUDriver driver;
const char *dataDir; const char *inputDir;
const char *outputDir;
const char *archName; const char *archName;
const char *base; const char *base;
int ret; int ret;
@ -48,7 +49,8 @@ testQemuDataInit(testQemuDataPtr data)
if (qemuTestDriverInit(&data->driver) < 0) if (qemuTestDriverInit(&data->driver) < 0)
return -1; return -1;
data->dataDir = TEST_QEMU_CAPS_PATH; data->inputDir = TEST_QEMU_CAPS_PATH;
data->outputDir = TEST_QEMU_CAPS_PATH;
data->ret = 0; data->ret = 0;
@ -77,9 +79,9 @@ testQemuCaps(const void *opaque)
const char *p; const char *p;
if (virAsprintf(&repliesFile, "%s/%s.%s.replies", if (virAsprintf(&repliesFile, "%s/%s.%s.replies",
data->dataDir, data->base, data->archName) < 0 || data->inputDir, data->base, data->archName) < 0 ||
virAsprintf(&capsFile, "%s/%s.%s.xml", virAsprintf(&capsFile, "%s/%s.%s.xml",
data->dataDir, data->base, data->archName) < 0) data->outputDir, data->base, data->archName) < 0)
goto cleanup; goto cleanup;
if (!(mon = qemuMonitorTestNewFromFileFull(repliesFile, &data->driver, NULL, if (!(mon = qemuMonitorTestNewFromFileFull(repliesFile, &data->driver, NULL,
@ -146,7 +148,7 @@ testQemuCapsCopy(const void *opaque)
char *actual = NULL; char *actual = NULL;
if (virAsprintf(&capsFile, "%s/%s.%s.xml", if (virAsprintf(&capsFile, "%s/%s.%s.xml",
data->dataDir, data->base, data->archName) < 0) data->outputDir, data->base, data->archName) < 0)
goto cleanup; goto cleanup;
if (!(caps = virCapabilitiesNew(virArchFromString(data->archName), if (!(caps = virCapabilitiesNew(virArchFromString(data->archName),