[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v4 20/29] qapi: Plug leaks in test-qmp-input-vis
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH RFC v4 20/29] qapi: Plug leaks in test-qmp-input-visitor |
Date: |
Wed, 9 Sep 2015 22:06:22 -0600 |
Make valgrind happy with the current state of the test, so that
the next patch can more easily expose a memory leak without it
being drowned by noise.
Signed-off-by: Eric Blake <address@hidden>
---
tests/test-qmp-input-visitor.c | 34 +++++++++++++++++++++++++++++++---
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
index bba7ab2..67e4d17 100644
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -98,6 +98,7 @@ static void test_visitor_in_int(TestInputVisitorData *data,
visit_type_int(v, &res, NULL, &err);
g_assert(!err);
g_assert_cmpint(res, ==, value);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_int_overflow(TestInputVisitorData *data,
@@ -116,6 +117,7 @@ static void
test_visitor_in_int_overflow(TestInputVisitorData *data,
visit_type_int(v, &res, NULL, &err);
g_assert(err);
error_free(err);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_bool(TestInputVisitorData *data,
@@ -130,6 +132,7 @@ static void test_visitor_in_bool(TestInputVisitorData *data,
visit_type_bool(v, &res, NULL, &err);
g_assert(!err);
g_assert_cmpint(res, ==, true);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_number(TestInputVisitorData *data,
@@ -144,6 +147,7 @@ static void test_visitor_in_number(TestInputVisitorData
*data,
visit_type_number(v, &res, NULL, &err);
g_assert(!err);
g_assert_cmpfloat(res, ==, value);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_string(TestInputVisitorData *data,
@@ -160,6 +164,7 @@ static void test_visitor_in_string(TestInputVisitorData
*data,
g_assert_cmpstr(res, ==, value);
g_free(res);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_enum(TestInputVisitorData *data,
@@ -237,6 +242,7 @@ static void test_visitor_in_struct(TestInputVisitorData
*data,
g_free(p->string);
g_free(p);
+ visitor_input_teardown(data, NULL);
}
static void check_and_free_str(char *str, const char *cmp)
@@ -271,6 +277,7 @@ static void
test_visitor_in_struct_nested(TestInputVisitorData *data,
g_free(udp->dict1->dict2);
g_free(udp->dict1);
g_free(udp);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_list(TestInputVisitorData *data,
@@ -296,6 +303,7 @@ static void test_visitor_in_list(TestInputVisitorData *data,
}
qapi_free_UserDefOneList(head);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_any(TestInputVisitorData *data,
@@ -317,6 +325,7 @@ static void test_visitor_in_any(TestInputVisitorData *data,
g_assert(qint);
g_assert_cmpint(qint_get_int(qint), ==, -42);
qobject_decref(res);
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "{ 'integer': -42, 'boolean': true,
'string': 'foo' }");
visit_type_any(v, &res, NULL, &err);
@@ -339,6 +348,7 @@ static void test_visitor_in_any(TestInputVisitorData *data,
g_assert(qstring);
g_assert_cmpstr(qstring_get_str(qstring), ==, "foo");
qobject_decref(res);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_union_flat(TestInputVisitorData *data,
@@ -361,6 +371,7 @@ static void test_visitor_in_union_flat(TestInputVisitorData
*data,
g_assert_cmpint(tmp->integer, ==, 41);
g_assert_cmpint(tmp->value1->boolean, ==, true);
qapi_free_UserDefFlatUnion(tmp);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_alternate(TestInputVisitorData *data,
@@ -371,28 +382,28 @@ static void
test_visitor_in_alternate(TestInputVisitorData *data,
UserDefAlternate *tmp = NULL;
v = visitor_input_test_init(data, "42");
-
visit_type_UserDefAlternate(v, &tmp, NULL, &error_abort);
g_assert_cmpint(tmp->type, ==, QTYPE_QINT);
g_assert_cmpint(tmp->i, ==, 42);
qapi_free_UserDefAlternate(tmp);
tmp = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "'string'");
-
visit_type_UserDefAlternate(v, &tmp, NULL, &error_abort);
g_assert_cmpint(tmp->type, ==, QTYPE_QSTRING);
g_assert_cmpstr(tmp->s, ==, "string");
qapi_free_UserDefAlternate(tmp);
tmp = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "false");
-
visit_type_UserDefAlternate(v, &tmp, NULL, &err);
g_assert(err);
error_free(err);
err = NULL;
qapi_free_UserDefAlternate(tmp);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_alternate_number(TestInputVisitorData *data,
@@ -414,6 +425,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert(err);
qapi_free_AltOne(one);
one = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "42");
visit_type_AltTwo(v, &two, NULL, &error_abort);
@@ -421,6 +433,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert_cmpfloat(two->n, ==, 42.0);
qapi_free_AltTwo(two);
one = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "42");
visit_type_AltThree(v, &three, NULL, &error_abort);
@@ -428,6 +441,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert_cmpfloat(three->n, ==, 42.0);
qapi_free_AltThree(three);
one = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "42");
visit_type_AltFour(v, &four, NULL, &error_abort);
@@ -435,6 +449,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert_cmpint(four->i, ==, 42);
qapi_free_AltFour(four);
one = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "42");
visit_type_AltFive(v, &five, NULL, &error_abort);
@@ -442,6 +457,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert_cmpint(five->i, ==, 42);
qapi_free_AltFive(five);
one = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "42");
visit_type_AltSix(v, &six, NULL, &error_abort);
@@ -449,6 +465,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert_cmpint(six->i, ==, 42);
qapi_free_AltSix(six);
one = NULL;
+ visitor_input_teardown(data, NULL);
/* Parsing a double */
@@ -459,6 +476,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
err = NULL;
qapi_free_AltOne(one);
one = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "42.5");
visit_type_AltTwo(v, &two, NULL, &error_abort);
@@ -466,6 +484,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert_cmpfloat(two->n, ==, 42.5);
qapi_free_AltTwo(two);
two = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "42.5");
visit_type_AltThree(v, &three, NULL, &error_abort);
@@ -473,6 +492,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert_cmpfloat(three->n, ==, 42.5);
qapi_free_AltThree(three);
three = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "42.5");
visit_type_AltFour(v, &four, NULL, &err);
@@ -481,6 +501,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
err = NULL;
qapi_free_AltFour(four);
four = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "42.5");
visit_type_AltFive(v, &five, NULL, &error_abort);
@@ -488,6 +509,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert_cmpfloat(five->n, ==, 42.5);
qapi_free_AltFive(five);
five = NULL;
+ visitor_input_teardown(data, NULL);
v = visitor_input_test_init(data, "42.5");
visit_type_AltSix(v, &six, NULL, &error_abort);
@@ -495,6 +517,7 @@ static void
test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert_cmpint(six->n, ==, 42.5);
qapi_free_AltSix(six);
six = NULL;
+ visitor_input_teardown(data, NULL);
}
static void test_native_list_integer_helper(TestInputVisitorData *data,
@@ -595,6 +618,7 @@ static void
test_native_list_integer_helper(TestInputVisitorData *data,
g_string_free(gstr_union, true);
g_string_free(gstr_list, true);
qapi_free_UserDefNativeListUnion(cvalue);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_native_list_int(TestInputVisitorData *data,
@@ -694,6 +718,7 @@ static void
test_visitor_in_native_list_bool(TestInputVisitorData *data,
g_string_free(gstr_union, true);
g_string_free(gstr_list, true);
qapi_free_UserDefNativeListUnion(cvalue);
+ visitor_input_teardown(data, NULL);
}
static void test_visitor_in_native_list_string(TestInputVisitorData *data,
@@ -731,6 +756,7 @@ static void
test_visitor_in_native_list_string(TestInputVisitorData *data,
g_string_free(gstr_union, true);
g_string_free(gstr_list, true);
qapi_free_UserDefNativeListUnion(cvalue);
+ visitor_input_teardown(data, NULL);
}
#define DOUBLE_STR_MAX 16
@@ -776,6 +802,7 @@ static void
test_visitor_in_native_list_number(TestInputVisitorData *data,
g_string_free(gstr_union, true);
g_string_free(gstr_list, true);
qapi_free_UserDefNativeListUnion(cvalue);
+ visitor_input_teardown(data, NULL);
}
static void input_visitor_test_add(const char *testpath,
@@ -804,6 +831,7 @@ static void test_visitor_in_errors(TestInputVisitorData
*data,
error_free(err);
g_free(p->string);
g_free(p);
+ visitor_input_teardown(data, NULL);
}
int main(int argc, char **argv)
--
2.4.3
- [Qemu-devel] [PATCH RFC v4 17/29] qapi: Drop useless 'data' member of unions, (continued)
- [Qemu-devel] [PATCH RFC v4 17/29] qapi: Drop useless 'data' member of unions, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 11/29] qapi: Don't pass pre-existing error to later call, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 14/29] qapi: Rework deallocation of partial struct, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 10/29] qapi: Fix alternates that accept 'number' but not 'int', Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 13/29] qapi: Add tests for empty unions, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 16/29] qapi: Forbid empty unions and useless alternates, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 15/29] qapi: Avoid use of 'data' member of qapi unions, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 18/29] qapi: Remove dead visitor code, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 21/29] qapi: Test failure in middle of array parse, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 19/29] qapi: Document visitor interfaces, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 20/29] qapi: Plug leaks in test-qmp-input-visitor,
Eric Blake <=
- [Qemu-devel] [PATCH RFC v4 22/29] qapi: Change visit_type_FOO() to no longer return partial objects, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 03/29] qapi: use 'type' in generated C code to match QMP union wire form, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 24/29] qapi: Implement boxed structs for commands/events, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 23/29] qapi: Plumb in 'box' to qapi generator lower levels, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 25/29] qapi: Support boxed unions, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 26/29] qapi: Clean up qapi.py per pep8, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 29/29] net: Complete qapi-fication of netdev_add, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 28/29] net: Use correct type for bool flag, Eric Blake, 2015/09/10
- [Qemu-devel] [PATCH RFC v4 27/29] qapi: Change Netdev into a flat union, Eric Blake, 2015/09/10