From b48c7bf8a627bae84266e07f08a191709a090bab Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 30 Apr 2013 14:40:50 -0400 Subject: [PATCH] Make regress_finalize work with malloc replacement disabled --- test/regress_finalize.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/regress_finalize.c b/test/regress_finalize.c index d2916ab1..2bcab8ba 100644 --- a/test/regress_finalize.c +++ b/test/regress_finalize.c @@ -158,6 +158,7 @@ end: ; } +#ifndef EVENT__DISABLE_MM_REPLACEMENT static void * tfff_malloc(size_t n) { @@ -181,12 +182,15 @@ tfff_realloc(void *p, size_t sz) { return realloc(p,sz); } +#endif static void test_fin_free_finalize(void *arg) { +#ifdef EVENT__DISABLE_MM_REPLACEMENT + tinytest_set_test_skipped_(); +#else struct event_base *base = NULL; - struct event *ev, *ev2; int ev_called = 0; int ev2_called = 0; @@ -218,6 +222,7 @@ test_fin_free_finalize(void *arg) end: if (base) event_base_free(base); +#endif } /* For test_fin_within_cb */ -- 2.40.0