aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wmem/wmem_test.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-06-16 01:44:09 +0000
committerEvan Huus <eapache@gmail.com>2013-06-16 01:44:09 +0000
commit28dafa414a5f6c51b41f94622ce5359074a305bc (patch)
tree7853a87cc175687dd402036864dd5ecbb1bf970d /epan/wmem/wmem_test.c
parentca0f8ee6da0766787fb5f8e7f5c815b9ed88fbcc (diff)
Fix occasional wmem_test failure, allocator destruction order matters
(should it?) svn path=/trunk/; revision=49951
Diffstat (limited to 'epan/wmem/wmem_test.c')
-rw-r--r--epan/wmem/wmem_test.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/wmem/wmem_test.c b/epan/wmem/wmem_test.c
index 6df0a65f1c..a9b59316c2 100644
--- a/epan/wmem/wmem_test.c
+++ b/epan/wmem/wmem_test.c
@@ -603,7 +603,7 @@ wmem_test_tree(void)
wmem_tree_insert32(tree, i, GINT_TO_POINTER(i));
g_assert(wmem_tree_lookup32(tree, i) == GINT_TO_POINTER(i));
}
- wmem_free_all(extra_allocator);
+ wmem_destroy_allocator(extra_allocator);
for (i=0; i<CONTAINER_ITERS; i++) {
g_assert(wmem_tree_lookup32(tree, i) == NULL);
g_assert(wmem_tree_lookup32_le(tree, i) == NULL);
@@ -646,9 +646,6 @@ wmem_test_tree(void)
}
g_assert(seen_values == 10);
- wmem_free_all(allocator);
-
- wmem_destroy_allocator(extra_allocator);
wmem_destroy_allocator(allocator);
}