[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/32] test-string-input-visitor: Use virtual walk
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 07/32] test-string-input-visitor: Use virtual walk |
Date: |
Thu, 13 Dec 2018 19:43:15 +0100 |
From: David Hildenbrand <address@hidden>
We now support virtual walks, so use that instead.
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
tests/test-string-input-visitor.c | 36 +++++++++++--------------------
1 file changed, 12 insertions(+), 24 deletions(-)
diff --git a/tests/test-string-input-visitor.c
b/tests/test-string-input-visitor.c
index c5379365a6..718d9a03c3 100644
--- a/tests/test-string-input-visitor.c
+++ b/tests/test-string-input-visitor.c
@@ -115,7 +115,6 @@ static void test_visitor_in_intList(TestInputVisitorData
*data,
uint64_t expect5[] = { UINT64_MAX };
Error *err = NULL;
int64List *res = NULL;
- int64List *tail;
Visitor *v;
int64_t val;
@@ -188,39 +187,28 @@ static void test_visitor_in_intList(TestInputVisitorData
*data,
v = visitor_input_test_init(data, "0,2-3");
- /* Would be simpler if the visitor genuinely supported virtual walks */
- visit_start_list(v, NULL, (GenericList **)&res, sizeof(*res),
- &error_abort);
- tail = res;
- visit_type_int64(v, NULL, &tail->value, &error_abort);
- g_assert_cmpint(tail->value, ==, 0);
- tail = (int64List *)visit_next_list(v, (GenericList *)tail, sizeof(*res));
- g_assert(tail);
- visit_type_int64(v, NULL, &tail->value, &error_abort);
- g_assert_cmpint(tail->value, ==, 2);
- tail = (int64List *)visit_next_list(v, (GenericList *)tail, sizeof(*res));
- g_assert(tail);
+ visit_start_list(v, NULL, NULL, 0, &error_abort);
+ visit_type_int64(v, NULL, &val, &error_abort);
+ g_assert_cmpint(val, ==, 0);
+ visit_type_int64(v, NULL, &val, &error_abort);
+ g_assert_cmpint(val, ==, 2);
visit_check_list(v, &err);
error_free_or_abort(&err);
- visit_end_list(v, (void **)&res);
-
- qapi_free_int64List(res);
+ visit_end_list(v, NULL);
/* Visit beyond end of list */
+
v = visitor_input_test_init(data, "0");
- visit_start_list(v, NULL, (GenericList **)&res, sizeof(*res),
- &error_abort);
- tail = res;
- visit_type_int64(v, NULL, &tail->value, &err);
- g_assert_cmpint(tail->value, ==, 0);
+ visit_start_list(v, NULL, NULL, 0, &error_abort);
+ visit_type_int64(v, NULL, &val, &err);
+ g_assert_cmpint(val, ==, 0);
visit_type_int64(v, NULL, &val, &err);
error_free_or_abort(&err);
+
visit_check_list(v, &error_abort);
- visit_end_list(v, (void **)&res);
-
- qapi_free_int64List(res);
+ visit_end_list(v, NULL);
}
static void test_visitor_in_bool(TestInputVisitorData *data,
--
2.17.2
- [Qemu-devel] [PULL 00/32] QAPI patches for 2018-12-13, Markus Armbruster, 2018/12/13
- [Qemu-devel] [PULL 03/32] qapi: Fix string-input-visitor to reject NaN and infinities, Markus Armbruster, 2018/12/13
- [Qemu-devel] [PULL 07/32] test-string-input-visitor: Use virtual walk,
Markus Armbruster <=
- [Qemu-devel] [PULL 04/32] qapi: Use qemu_strtod_finite() in qobject-input-visitor, Markus Armbruster, 2018/12/13
- [Qemu-devel] [PULL 06/32] qapi: Rewrite string-input-visitor's integer and list parsing, Markus Armbruster, 2018/12/13
- [Qemu-devel] [PULL 08/32] test-string-input-visitor: Split off uint64 list tests, Markus Armbruster, 2018/12/13
- [Qemu-devel] [PULL 15/32] qapi: Do not define enumeration value explicitly, Markus Armbruster, 2018/12/13
- [Qemu-devel] [PULL 05/32] test-string-input-visitor: Add more tests, Markus Armbruster, 2018/12/13
- [Qemu-devel] [PULL 12/32] tests/qapi: Cover commands with 'if' and union / alternate 'data', Markus Armbruster, 2018/12/13
- [Qemu-devel] [PULL 31/32] qapi: add more conditions to SPICE, Markus Armbruster, 2018/12/13
- [Qemu-devel] [PULL 13/32] qapi: rename QAPISchemaEnumType.values to .members, Markus Armbruster, 2018/12/13
- [Qemu-devel] [PULL 27/32] qapi: add #if conditions to generated code members, Markus Armbruster, 2018/12/13