From b1798ddcfb952efb7cc8bacaf51b3486a7fec121 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 10 Mar 2010 10:47:26 -0500 Subject: Fix build when check-devel is not installed tests/common.c is now required by all tests (check-based and not), so we need to properly ifdef it --- src/tests/common.c | 82 ------------------------------------------------------ 1 file changed, 82 deletions(-) (limited to 'src/tests/common.c') diff --git a/src/tests/common.c b/src/tests/common.c index 4ae1f490b..cd13507c1 100644 --- a/src/tests/common.c +++ b/src/tests/common.c @@ -22,92 +22,10 @@ along with this program. If not, see . */ -#include #include - #include "tests/common.h" -#include "util/dlinklist.h" - -TALLOC_CTX *global_talloc_context = NULL; #include "util/util.h" -struct size_snapshot { - struct size_snapshot *prev; - struct size_snapshot *next; - - TALLOC_CTX *ctx; - size_t bytes_allocated; -}; - -static struct size_snapshot *snapshot_stack; - -void -_check_leaks(TALLOC_CTX *ctx, size_t bytes, const char *location) -{ - size_t bytes_allocated; - - bytes_allocated = talloc_total_size(ctx); - if (bytes_allocated != bytes) { - fprintf(stderr, "Leak report for %s:\n", location); - talloc_report_full(ctx, stderr); - fail("%s: memory leaks detected, %d bytes still allocated", - location, bytes_allocated - bytes); - } -} - -void -check_leaks_push(TALLOC_CTX *ctx) -{ - struct size_snapshot *snapshot; - - snapshot = talloc(NULL, struct size_snapshot); - snapshot->ctx = ctx; - snapshot->bytes_allocated = talloc_total_size(ctx); - DLIST_ADD(snapshot_stack, snapshot); -} - -void -_check_leaks_pop(TALLOC_CTX *ctx, const char *location) -{ - struct size_snapshot *snapshot; - TALLOC_CTX *old_ctx; - size_t bytes_allocated; - - if (snapshot_stack == NULL) { - fail("%s: trying to pop an empty stack"); - } - - snapshot = snapshot_stack; - DLIST_REMOVE(snapshot_stack, snapshot); - - old_ctx = snapshot->ctx; - bytes_allocated = snapshot->bytes_allocated; - - fail_if(old_ctx != ctx, "Bad push/pop order"); - - talloc_zfree(snapshot); - _check_leaks(old_ctx, bytes_allocated, location); -} - -void -leak_check_setup(void) -{ - talloc_enable_null_tracking(); - global_talloc_context = talloc_new(NULL); - fail_unless(global_talloc_context != NULL, "talloc_new failed"); - check_leaks_push(global_talloc_context); -} - -void -leak_check_teardown(void) -{ - check_leaks_pop(global_talloc_context); - if (snapshot_stack != NULL) { - fail("Exiting with a non-empty stack"); - } - check_leaks(global_talloc_context, 0); -} - void tests_set_cwd(void) { -- cgit