tests: qemumonitorjson: Fix schema testing of monitor commands

The 'simpleFunc' data structure is overwritten by the code generated
from the macros which initiate the tests. This means that most of the
tests would get NULL 'schema' member which means that the schema
validation would not take place.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Peter Krempa 2018-07-12 13:40:00 +02:00
parent 1fc1102391
commit b3a0e3aab1

View File

@ -2879,7 +2879,6 @@ mymain(void)
ret = -1;
goto cleanup;
}
simpleFunc.schema = qapiData.schema;
#define DO_TEST(name) \
if (virTestRun(# name, testQemuMonitorJSON ## name, driver.xmlopt) < 0) \
@ -2887,7 +2886,9 @@ mymain(void)
#define DO_TEST_SIMPLE(CMD, FNC, ...) \
simpleFunc = (testQemuMonitorJSONSimpleFuncData) {.cmd = CMD, .func = FNC, \
.xmlopt = driver.xmlopt, __VA_ARGS__ }; \
.xmlopt = driver.xmlopt, \
.schema = qapiData.schema, \
__VA_ARGS__ }; \
if (virTestRun(# FNC, testQemuMonitorJSONSimpleFunc, &simpleFunc) < 0) \
ret = -1