External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-05 04:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: add parseFlags to qemuxml2argvtest

Browse Source
This commit is contained in:
Ján Tomko 2016-02-25 16:21:13 +01:00
parent 2d40e2da7b
commit b564113d56
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/qemuxml2argvtest.c
View File

@ -253,7 +253,8 @@ static int testCompareXMLToArgvFiles(const char *xml,
const char *cmdline, const char *cmdline,
virQEMUCapsPtr extraFlags, virQEMUCapsPtr extraFlags,
const char *migrateURI, const char *migrateURI,
virQemuXML2ArgvTestFlags flags) virQemuXML2ArgvTestFlags flags,
unsigned int parseFlags)
{ {
char *actualargv = NULL; char *actualargv = NULL;
int ret = -1; int ret = -1;
@ -275,7 +276,8 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto out; goto out;
if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt,
VIR_DOMAIN_DEF_PARSE_INACTIVE))) { (VIR_DOMAIN_DEF_PARSE_INACTIVE |
parseFlags)))) {
if (!virtTestOOMActive() && if (!virtTestOOMActive() &&
(flags & FLAG_EXPECT_PARSE_ERROR)) (flags & FLAG_EXPECT_PARSE_ERROR))
goto ok; goto ok;
@ -408,6 +410,7 @@ struct testInfo {
const char *migrateFrom; const char *migrateFrom;
int migrateFd; int migrateFd;
unsigned int flags; unsigned int flags;
unsigned int parseFlags;
}; };
static int static int
@ -443,7 +446,7 @@ testCompareXMLToArgvHelper(const void *data)
goto cleanup; goto cleanup;
result = testCompareXMLToArgvFiles(xml, args, info->extraFlags, result = testCompareXMLToArgvFiles(xml, args, info->extraFlags,
migrateURI, flags); migrateURI, flags, info->parseFlags);
cleanup: cleanup:
VIR_FREE(migrateURI); VIR_FREE(migrateURI);
@ -537,10 +540,11 @@ mymain(void)
if (VIR_STRDUP_QUIET(driver.config->channelTargetDir, "/tmp") < 0) if (VIR_STRDUP_QUIET(driver.config->channelTargetDir, "/tmp") < 0)
return EXIT_FAILURE; return EXIT_FAILURE;
# define DO_TEST_FULL(name, migrateFrom, migrateFd, flags, ...) \ # define DO_TEST_FULL(name, migrateFrom, migrateFd, flags, \
parseFlags, ...) \
do { \ do { \
static struct testInfo info = { \ static struct testInfo info = { \
name, NULL, migrateFrom, migrateFd, (flags) \ name, NULL, migrateFrom, migrateFd, (flags), parseFlags \
}; \ }; \
if (!(info.extraFlags = virQEMUCapsNew())) \ if (!(info.extraFlags = virQEMUCapsNew())) \
return EXIT_FAILURE; \ return EXIT_FAILURE; \
@ -554,21 +558,22 @@ mymain(void)
} while (0) } while (0)
# define DO_TEST(name, ...) \ # define DO_TEST(name, ...) \
DO_TEST_FULL(name, NULL, -1, 0, __VA_ARGS__) DO_TEST_FULL(name, NULL, -1, 0, 0, __VA_ARGS__)
# define DO_TEST_ERROR(name, ...) \ # define DO_TEST_ERROR(name, ...) \
DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_ERROR, __VA_ARGS__) DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_ERROR, 0, __VA_ARGS__)
# define DO_TEST_FAILURE(name, ...) \ # define DO_TEST_FAILURE(name, ...) \
DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_FAILURE, __VA_ARGS__) DO_TEST_FULL(name, NULL, -1, FLAG_EXPECT_FAILURE, 0, __VA_ARGS__)
# define DO_TEST_PARSE_ERROR(name, ...) \ # define DO_TEST_PARSE_ERROR(name, ...) \
DO_TEST_FULL(name, NULL, -1, \ DO_TEST_FULL(name, NULL, -1, \
FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_ERROR, \ FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_ERROR, \
__VA_ARGS__) 0, __VA_ARGS__)
# define DO_TEST_LINUX(name, ...) \ # define DO_TEST_LINUX(name, ...) \
DO_TEST_LINUX_FULL(name, NULL, -1, 0, __VA_ARGS__) DO_TEST_LINUX_FULL(name, NULL, -1, 0, 0, __VA_ARGS__)
# ifdef __linux__ # ifdef __linux__
/* This is a macro that invokes test only on Linux. It's /* This is a macro that invokes test only on Linux. It's
@ -1262,12 +1267,12 @@ mymain(void)
QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_PCI_ROMBAR); QEMU_CAPS_PCI_ROMBAR);
DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, NONE); DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, NONE);
DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, NONE); DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, 0, NONE);
DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, NONE); DO_TEST_FULL("restore-v2-fd", "fd:7", 7, 0, 0, NONE);
DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, NONE); DO_TEST_FULL("migrate", "tcp:10.0.0.1:5000", -1, 0, 0, NONE);
DO_TEST_LINUX_FULL("migrate-numa-unaligned", "stdio", 7, 0, DO_TEST_LINUX_FULL("migrate-numa-unaligned", "stdio", 7, 0, 0,
QEMU_CAPS_NUMA, QEMU_CAPS_NUMA,
QEMU_CAPS_OBJECT_MEMORY_RAM); QEMU_CAPS_OBJECT_MEMORY_RAM);