diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-22 16:27:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-22 16:27:29 -0400 |
| commit | 1a73e178011d24ad2ef252dab7256d7c4fa94a64 (patch) | |
| tree | 35990ad7f447fcebe8422aed4b66047f9fec2d29 /src/test/test_util.c | |
| parent | fef65fa64341fb70df0e7b34d91d3b08a74e7aad (diff) | |
| parent | 170e0df7417e78f7b689f3189e7a0b5b8dfd2722 (diff) | |
| download | tor-1a73e178011d24ad2ef252dab7256d7c4fa94a64.tar.gz tor-1a73e178011d24ad2ef252dab7256d7c4fa94a64.zip | |
Merge remote-tracking branch 'andrea/bug11476'
Diffstat (limited to 'src/test/test_util.c')
| -rw-r--r-- | src/test/test_util.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index 65cc58a66b..c7fa141188 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -12,7 +12,9 @@ #include "config.h" #include "control.h" #include "test.h" +#ifdef ENABLE_MEMPOOLS #include "mempool.h" +#endif /* ENABLE_MEMPOOLS */ #include "memarea.h" #ifdef _WIN32 @@ -1899,6 +1901,8 @@ test_util_path_is_relative(void) ; } +#ifdef ENABLE_MEMPOOLS + /** Run unittests for memory pool allocator */ static void test_util_mempool(void) @@ -1957,6 +1961,8 @@ test_util_mempool(void) mp_pool_destroy(pool); } +#endif /* ENABLE_MEMPOOLS */ + /** Run unittests for memory area allocator */ static void test_util_memarea(void) @@ -3661,7 +3667,9 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(pow2), UTIL_LEGACY(gzip), UTIL_LEGACY(datadir), +#ifdef ENABLE_MEMPOOLS UTIL_LEGACY(mempool), +#endif UTIL_LEGACY(memarea), UTIL_LEGACY(control_formats), UTIL_LEGACY(mmap), |