From b3a0e3aab14385c0c65d32e512218961cd79b6c1 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 12 Jul 2018 13:40:00 +0200 Subject: [PATCH] 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 --- tests/qemumonitorjsontest.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index fce2108932..95b718ab37 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -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