aboutsummaryrefslogtreecommitdiff
path: root/src/test/testing_common.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-20 10:19:56 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-20 10:21:34 -0400
commit9fa73003fca5e884c0c663c2035ce6e60994c339 (patch)
tree4bebae718e21b5ded3eaddb8f673998b0e09c25c /src/test/testing_common.c
parente4e949e901400c8516a2db8d2fd508b1e7bb842e (diff)
downloadtor-9fa73003fca5e884c0c663c2035ce6e60994c339.tar.gz
tor-9fa73003fca5e884c0c663c2035ce6e60994c339.zip
Remove dmalloc support; closes #26426
Dmalloc hasn't seen a release in over a decade, and there are much better tools to use these days.
Diffstat (limited to 'src/test/testing_common.c')
-rw-r--r--src/test/testing_common.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index 18b5b61064..8b83265d8f 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -32,11 +32,6 @@
#include <dirent.h>
#endif /* defined(_WIN32) */
-#ifdef USE_DMALLOC
-#include <dmalloc.h>
-#include "or/main.h"
-#endif
-
/** Temporary directory (set up by setup_directory) under which we store all
* our files during testing. */
static char temp_dir[256];
@@ -231,13 +226,6 @@ main(int c, const char **v)
/* We must initialise logs before we call tor_assert() */
init_logging(1);
-#ifdef USE_DMALLOC
- {
- int r = crypto_use_tor_alloc_functions();
- tor_assert(r == 0);
- }
-#endif /* defined(USE_DMALLOC) */
-
update_approx_time(time(NULL));
options = options_new();
tor_threads_init();
@@ -319,10 +307,7 @@ main(int c, const char **v)
int have_failed = (tinytest_main(c, v, testgroups) != 0);
free_pregenerated_keys();
-#ifdef USE_DMALLOC
- tor_free_all(0);
- dmalloc_log_unfreed();
-#endif
+
crypto_global_cleanup();
if (have_failed)
@@ -330,4 +315,3 @@ main(int c, const char **v)
else
return 0;
}
-