From b565e40705bb5f788da3c9f64fe0ddcce1c63a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Fri, 1 Jun 2018 13:00:12 +0200 Subject: [PATCH] virjsontest: use name instead of doc for deflatten test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This test gets its JSON docs from files. Now that we have a 'name' field in testInfo, use it instead of abusing the 'doc' field. Signed-off-by: Ján Tomko Reviewed-by: Daniel P. Berrangé --- tests/virjsontest.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/virjsontest.c b/tests/virjsontest.c index 779bf441bd..6f2f7f56ed 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -326,9 +326,9 @@ testJSONDeflatten(const void *data) int ret = -1; if (virAsprintf(&infile, "%s/virjsondata/deflatten-%s-in.json", - abs_srcdir, info->doc) < 0 || + abs_srcdir, info->name) < 0 || virAsprintf(&outfile, "%s/virjsondata/deflatten-%s-out.json", - abs_srcdir, info->doc) < 0) + abs_srcdir, info->name) < 0) goto cleanup; if (virTestLoadFile(infile, &indata) < 0) @@ -339,7 +339,7 @@ testJSONDeflatten(const void *data) if ((deflattened = virJSONValueObjectDeflatten(injson))) { if (!info->pass) { - VIR_TEST_VERBOSE("%s: deflattening should have failed\n", info->doc); + VIR_TEST_VERBOSE("%s: deflattening should have failed\n", info->name); goto cleanup; } } else { @@ -638,7 +638,7 @@ mymain(void) ObjectFormatSteal, NULL, NULL, true); #define DO_TEST_DEFLATTEN(name, pass) \ - DO_TEST_FULL(name, Deflatten, name, NULL, pass) + DO_TEST_FULL(name, Deflatten, NULL, NULL, pass) DO_TEST_DEFLATTEN("unflattened", true); DO_TEST_DEFLATTEN("basic-file", true); -- GitLab