[PATCH] test: fix up InputAttributes helper function test.
Peter Hutterer
peter.hutterer at who-t.net
Thu May 27 07:26:32 PDT 2010
Just some extra clarification and that memcpy should have been a memcmp.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
Dan, does this address all your comments?
test/input.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/test/input.c b/test/input.c
index 8a54af9..12771c5 100644
--- a/test/input.c
+++ b/test/input.c
@@ -803,12 +803,18 @@ static void cmp_attr_fields(InputAttributes *attr1,
tags1 = attr1->tags;
tags2 = attr2->tags;
+
+ /* if we don't have any tags, skip the tag checking bits */
if (!tags1)
{
g_assert(!tags2);
return;
}
+ /* Don't lug around empty arrays */
+ g_assert(*tags1);
+ g_assert(*tags2);
+
/* check for identical content, but duplicated */
while (*tags1)
{
@@ -818,6 +824,7 @@ static void cmp_attr_fields(InputAttributes *attr1,
tags2++;
}
+ /* ensure tags1 and tags2 have the same no of elements */
g_assert(!*tags2);
/* check for not sharing memory */
@@ -842,7 +849,7 @@ static void dix_input_attributes(void)
g_assert(!new);
new = DuplicateInputAttributes(&orig);
- g_assert(memcpy(&orig, new, sizeof(InputAttributes)));
+ g_assert(memcmp(&orig, new, sizeof(InputAttributes)) == 0);
orig.product = "product name";
new = DuplicateInputAttributes(&orig);
--
1.6.5.2
More information about the xorg-devel
mailing list