diff options
author | David Goulet <dgoulet@torproject.org> | 2021-02-23 12:27:59 -0500 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2021-02-23 12:27:59 -0500 |
commit | 97e51dd01b228ecb72c912c6cf3ffae6334c8d07 (patch) | |
tree | 2113388c95eb49cdce0c46de2cff2135485401b2 /src/test | |
parent | bc21ed32903459c53599ee03605e8d23bf42ffe9 (diff) | |
parent | ad4f87ed3f2126814e42565e2d815e37f99f7c1f (diff) | |
download | tor-97e51dd01b228ecb72c912c6cf3ffae6334c8d07.tar.gz tor-97e51dd01b228ecb72c912c6cf3ffae6334c8d07.zip |
Merge branch 'tor-gitlab/mr/326' into maint-0.4.5
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/test_util.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index b3a1e2caca..d43bf781f2 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6775,57 +6775,6 @@ test_util_get_unquoted_path(void *arg) } static void -test_util_log_mallinfo(void *arg) -{ - (void)arg; - char *log1 = NULL, *log2 = NULL, *mem = NULL; -#ifdef HAVE_MALLINFO - setup_capture_of_logs(LOG_INFO); - tor_log_mallinfo(LOG_INFO); - expect_single_log_msg_containing("mallinfo() said: "); - mock_saved_log_entry_t *lg = smartlist_get(mock_saved_logs(), 0); - log1 = tor_strdup(lg->generated_msg); - - mock_clean_saved_logs(); - mem = tor_malloc(8192); - tor_log_mallinfo(LOG_INFO); - expect_single_log_msg_containing("mallinfo() said: "); - lg = smartlist_get(mock_saved_logs(), 0); - log2 = tor_strdup(lg->generated_msg); - - /* Make sure that the amount of used memory increased. */ - const char *used1 = strstr(log1, "uordblks="); - const char *used2 = strstr(log2, "uordblks="); - tt_assert(used1); - tt_assert(used2); - used1 += strlen("uordblks="); - used2 += strlen("uordblks="); - - int ok1, ok2; - char *next1 = NULL, *next2 = NULL; - uint64_t mem1 = tor_parse_uint64(used1, 10, 0, UINT64_MAX, &ok1, &next1); - uint64_t mem2 = tor_parse_uint64(used2, 10, 0, UINT64_MAX, &ok2, &next2); - tt_assert(ok1); - tt_assert(ok2); - tt_assert(next1); - tt_assert(next2); - if (mem2 == 0) { - /* This is a fake mallinfo that doesn't actually fill in its outputs. */ - tt_u64_op(mem1, OP_EQ, 0); - } else { - tt_u64_op(mem1, OP_LT, mem2); - } -#else /* !defined(HAVE_MALLINFO) */ - tt_skip(); -#endif /* defined(HAVE_MALLINFO) */ - done: - teardown_capture_of_logs(); - tor_free(log1); - tor_free(log2); - tor_free(mem); -} - -static void test_util_map_anon(void *arg) { (void)arg; @@ -7096,7 +7045,6 @@ struct testcase_t util_tests[] = { UTIL_TEST(monotonic_time_add_msec, 0), UTIL_TEST(htonll, 0), UTIL_TEST(get_unquoted_path, 0), - UTIL_TEST(log_mallinfo, 0), UTIL_TEST(map_anon, 0), UTIL_TEST(map_anon_nofork, 0), END_OF_TESTCASES |