[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 05/27] qapi: More tests of alternate output
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v9 05/27] qapi: More tests of alternate output |
Date: |
Tue, 3 Nov 2015 23:20:27 -0700 |
The testsuite was only covering that we could output a built-in
branch of an alternate; make sure that things still work even
when a branch involves allocation, to ensure that we don't leak
when run under valgrind.
Update to modern style of g_new0() over g_malloc0() while
touching it.
Signed-off-by: Eric Blake <address@hidden>
---
v9: new patch, split off of 10/17
---
tests/test-qmp-output-visitor.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c
index 0164984..0d0c859 100644
--- a/tests/test-qmp-output-visitor.c
+++ b/tests/test-qmp-output-visitor.c
@@ -425,8 +425,9 @@ static void
test_visitor_out_alternate(TestOutputVisitorData *data,
const void *unused)
{
QObject *arg;
+ UserDefAlternate *tmp;
- UserDefAlternate *tmp = g_malloc0(sizeof(UserDefAlternate));
+ tmp = g_new0(UserDefAlternate, 1);
tmp->type = USER_DEF_ALTERNATE_KIND_I;
tmp->u.i = 42;
@@ -438,6 +439,19 @@ static void
test_visitor_out_alternate(TestOutputVisitorData *data,
qapi_free_UserDefAlternate(tmp);
qobject_decref(arg);
+
+ tmp = g_new0(UserDefAlternate, 1);
+ tmp->type = USER_DEF_ALTERNATE_KIND_S;
+ tmp->u.s = g_strdup("hello");
+
+ visit_type_UserDefAlternate(data->ov, &tmp, NULL, &error_abort);
+ arg = qmp_output_get_qobject(data->qov);
+
+ g_assert(qobject_type(arg) == QTYPE_QSTRING);
+ g_assert_cmpstr(qstring_get_str(qobject_to_qstring(arg)), ==, "hello");
+
+ qapi_free_UserDefAlternate(tmp);
+ qobject_decref(arg);
}
static void test_visitor_out_empty(TestOutputVisitorData *data,
--
2.4.3
- [Qemu-devel] [PATCH v9 00/27] alternate layout (post-introspection cleanups, subset C), Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 07/27] qapi: More tests of input arrays, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 05/27] qapi: More tests of alternate output,
Eric Blake <=
- [Qemu-devel] [PATCH v9 06/27] qapi: Test failure in middle of array parse, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 02/27] qapi: Strengthen test of TestStructList, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 10/27] qapi: Track simple union tag in object.local_members, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 09/27] qapi-introspect: Document lack of sorting, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 14/27] qapi: Fix up commit 7618b91's clash sanity checking change, Eric Blake, 2015/11/04