diff options
Diffstat (limited to 'libc/malloc_debug/tests/malloc_debug_config_tests.cpp')
-rw-r--r-- | libc/malloc_debug/tests/malloc_debug_config_tests.cpp | 232 |
1 files changed, 139 insertions, 93 deletions
diff --git a/libc/malloc_debug/tests/malloc_debug_config_tests.cpp b/libc/malloc_debug/tests/malloc_debug_config_tests.cpp index f988124fe..77dc84842 100644 --- a/libc/malloc_debug/tests/malloc_debug_config_tests.cpp +++ b/libc/malloc_debug/tests/malloc_debug_config_tests.cpp @@ -31,14 +31,11 @@ class MallocDebugConfigTest : public ::testing::Test { resetLogs(); } - void TearDown() override { - } - std::unique_ptr<Config> config; bool InitConfig(const char* options) { config.reset(new Config); - return config->Set(options); + return config->Init(options); } }; @@ -201,8 +198,8 @@ TEST_F(MallocDebugConfigTest, set_value_error) { TEST_F(MallocDebugConfigTest, space_before_equal) { ASSERT_TRUE(InitConfig("backtrace =10")) << getFakeLogPrint(); - ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options); - ASSERT_EQ(10U, config->backtrace_frames); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options()); + ASSERT_EQ(10U, config->backtrace_frames()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -210,8 +207,8 @@ TEST_F(MallocDebugConfigTest, space_before_equal) { TEST_F(MallocDebugConfigTest, space_after_equal) { ASSERT_TRUE(InitConfig("backtrace= 10")) << getFakeLogPrint(); - ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options); - ASSERT_EQ(10U, config->backtrace_frames); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options()); + ASSERT_EQ(10U, config->backtrace_frames()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -219,8 +216,8 @@ TEST_F(MallocDebugConfigTest, space_after_equal) { TEST_F(MallocDebugConfigTest, extra_space) { ASSERT_TRUE(InitConfig(" backtrace=64 ")) << getFakeLogPrint(); - ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options); - ASSERT_EQ(64U, config->backtrace_frames); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options()); + ASSERT_EQ(64U, config->backtrace_frames()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -228,9 +225,9 @@ TEST_F(MallocDebugConfigTest, extra_space) { TEST_F(MallocDebugConfigTest, multiple_options) { ASSERT_TRUE(InitConfig(" backtrace=64 front_guard=48")) << getFakeLogPrint(); - ASSERT_EQ(BACKTRACE | TRACK_ALLOCS | FRONT_GUARD, config->options); - ASSERT_EQ(64U, config->backtrace_frames); - ASSERT_EQ(48U, config->front_guard_bytes); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS | FRONT_GUARD, config->options()); + ASSERT_EQ(64U, config->backtrace_frames()); + ASSERT_EQ(48U, config->front_guard_bytes()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -238,24 +235,24 @@ TEST_F(MallocDebugConfigTest, multiple_options) { TEST_F(MallocDebugConfigTest, front_guard) { ASSERT_TRUE(InitConfig("front_guard=48")) << getFakeLogPrint(); - ASSERT_EQ(FRONT_GUARD, config->options); - ASSERT_EQ(48U, config->front_guard_bytes); + ASSERT_EQ(FRONT_GUARD, config->options()); + ASSERT_EQ(48U, config->front_guard_bytes()); ASSERT_TRUE(InitConfig("front_guard")) << getFakeLogPrint(); - ASSERT_EQ(FRONT_GUARD, config->options); - ASSERT_EQ(32U, config->front_guard_bytes); + ASSERT_EQ(FRONT_GUARD, config->options()); + ASSERT_EQ(32U, config->front_guard_bytes()); ASSERT_TRUE(InitConfig("front_guard=39")) << getFakeLogPrint(); - ASSERT_EQ(FRONT_GUARD, config->options); + ASSERT_EQ(FRONT_GUARD, config->options()); #if defined(__LP64__) - ASSERT_EQ(48U, config->front_guard_bytes); + ASSERT_EQ(48U, config->front_guard_bytes()); #else - ASSERT_EQ(40U, config->front_guard_bytes); + ASSERT_EQ(40U, config->front_guard_bytes()); #endif ASSERT_TRUE(InitConfig("front_guard=41")) << getFakeLogPrint(); - ASSERT_EQ(FRONT_GUARD, config->options); - ASSERT_EQ(48U, config->front_guard_bytes); + ASSERT_EQ(FRONT_GUARD, config->options()); + ASSERT_EQ(48U, config->front_guard_bytes()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -263,12 +260,12 @@ TEST_F(MallocDebugConfigTest, front_guard) { TEST_F(MallocDebugConfigTest, rear_guard) { ASSERT_TRUE(InitConfig("rear_guard=50")) << getFakeLogPrint(); - ASSERT_EQ(REAR_GUARD, config->options); - ASSERT_EQ(50U, config->rear_guard_bytes); + ASSERT_EQ(REAR_GUARD, config->options()); + ASSERT_EQ(50U, config->rear_guard_bytes()); ASSERT_TRUE(InitConfig("rear_guard")) << getFakeLogPrint(); - ASSERT_EQ(REAR_GUARD, config->options); - ASSERT_EQ(32U, config->rear_guard_bytes); + ASSERT_EQ(REAR_GUARD, config->options()); + ASSERT_EQ(32U, config->rear_guard_bytes()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -276,14 +273,14 @@ TEST_F(MallocDebugConfigTest, rear_guard) { TEST_F(MallocDebugConfigTest, guard) { ASSERT_TRUE(InitConfig("guard=32")) << getFakeLogPrint(); - ASSERT_EQ(FRONT_GUARD | REAR_GUARD, config->options); - ASSERT_EQ(32U, config->front_guard_bytes); - ASSERT_EQ(32U, config->rear_guard_bytes); + ASSERT_EQ(FRONT_GUARD | REAR_GUARD, config->options()); + ASSERT_EQ(32U, config->front_guard_bytes()); + ASSERT_EQ(32U, config->rear_guard_bytes()); ASSERT_TRUE(InitConfig("guard")) << getFakeLogPrint(); - ASSERT_EQ(FRONT_GUARD | REAR_GUARD, config->options); - ASSERT_EQ(32U, config->front_guard_bytes); - ASSERT_EQ(32U, config->rear_guard_bytes); + ASSERT_EQ(FRONT_GUARD | REAR_GUARD, config->options()); + ASSERT_EQ(32U, config->front_guard_bytes()); + ASSERT_EQ(32U, config->rear_guard_bytes()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -291,12 +288,16 @@ TEST_F(MallocDebugConfigTest, guard) { TEST_F(MallocDebugConfigTest, backtrace) { ASSERT_TRUE(InitConfig("backtrace=64")) << getFakeLogPrint(); - ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options); - ASSERT_EQ(64U, config->backtrace_frames); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options()); + ASSERT_EQ(64U, config->backtrace_frames()); + ASSERT_TRUE(config->backtrace_enabled()); + ASSERT_FALSE(config->backtrace_enable_on_signal()); ASSERT_TRUE(InitConfig("backtrace")) << getFakeLogPrint(); - ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options); - ASSERT_EQ(16U, config->backtrace_frames); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options()); + ASSERT_EQ(16U, config->backtrace_frames()); + ASSERT_TRUE(config->backtrace_enabled()); + ASSERT_FALSE(config->backtrace_enable_on_signal()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -304,12 +305,50 @@ TEST_F(MallocDebugConfigTest, backtrace) { TEST_F(MallocDebugConfigTest, backtrace_enable_on_signal) { ASSERT_TRUE(InitConfig("backtrace_enable_on_signal=64")) << getFakeLogPrint(); - ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options); - ASSERT_EQ(64U, config->backtrace_frames); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options()); + ASSERT_EQ(64U, config->backtrace_frames()); + ASSERT_FALSE(config->backtrace_enabled()); + ASSERT_TRUE(config->backtrace_enable_on_signal()); ASSERT_TRUE(InitConfig("backtrace_enable_on_signal")) << getFakeLogPrint(); - ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options); - ASSERT_EQ(16U, config->backtrace_frames); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options()); + ASSERT_EQ(16U, config->backtrace_frames()); + ASSERT_FALSE(config->backtrace_enabled()); + ASSERT_TRUE(config->backtrace_enable_on_signal()); + + ASSERT_STREQ("", getFakeLogBuf().c_str()); + ASSERT_STREQ("", getFakeLogPrint().c_str()); +} + +TEST_F(MallocDebugConfigTest, backtrace_enable_on_signal_init) { + ASSERT_TRUE(InitConfig("backtrace_enable_on_signal=64")) << getFakeLogPrint(); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options()); + ASSERT_EQ(64U, config->backtrace_frames()); + ASSERT_FALSE(config->backtrace_enabled()); + ASSERT_TRUE(config->backtrace_enable_on_signal()); + + ASSERT_TRUE(InitConfig("backtrace")) << getFakeLogPrint(); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options()); + ASSERT_EQ(16U, config->backtrace_frames()); + ASSERT_TRUE(config->backtrace_enabled()); + ASSERT_FALSE(config->backtrace_enable_on_signal()); + + ASSERT_STREQ("", getFakeLogBuf().c_str()); + ASSERT_STREQ("", getFakeLogPrint().c_str()); +} + +TEST_F(MallocDebugConfigTest, backtrace_enable_and_backtrace) { + ASSERT_TRUE(InitConfig("backtrace_enable_on_signal backtrace")) << getFakeLogPrint(); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options()); + ASSERT_EQ(16U, config->backtrace_frames()); + ASSERT_TRUE(config->backtrace_enabled()); + ASSERT_TRUE(config->backtrace_enable_on_signal()); + + ASSERT_TRUE(InitConfig("backtrace backtrace_enable_on_signal")) << getFakeLogPrint(); + ASSERT_EQ(BACKTRACE | TRACK_ALLOCS, config->options()); + ASSERT_EQ(16U, config->backtrace_frames()); + ASSERT_TRUE(config->backtrace_enabled()); + ASSERT_TRUE(config->backtrace_enable_on_signal()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -317,12 +356,12 @@ TEST_F(MallocDebugConfigTest, backtrace_enable_on_signal) { TEST_F(MallocDebugConfigTest, fill_on_alloc) { ASSERT_TRUE(InitConfig("fill_on_alloc=64")) << getFakeLogPrint(); - ASSERT_EQ(FILL_ON_ALLOC, config->options); - ASSERT_EQ(64U, config->fill_on_alloc_bytes); + ASSERT_EQ(FILL_ON_ALLOC, config->options()); + ASSERT_EQ(64U, config->fill_on_alloc_bytes()); ASSERT_TRUE(InitConfig("fill_on_alloc")) << getFakeLogPrint(); - ASSERT_EQ(FILL_ON_ALLOC, config->options); - ASSERT_EQ(SIZE_MAX, config->fill_on_alloc_bytes); + ASSERT_EQ(FILL_ON_ALLOC, config->options()); + ASSERT_EQ(SIZE_MAX, config->fill_on_alloc_bytes()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -330,12 +369,12 @@ TEST_F(MallocDebugConfigTest, fill_on_alloc) { TEST_F(MallocDebugConfigTest, fill_on_free) { ASSERT_TRUE(InitConfig("fill_on_free=64")) << getFakeLogPrint(); - ASSERT_EQ(FILL_ON_FREE, config->options); - ASSERT_EQ(64U, config->fill_on_free_bytes); + ASSERT_EQ(FILL_ON_FREE, config->options()); + ASSERT_EQ(64U, config->fill_on_free_bytes()); ASSERT_TRUE(InitConfig("fill_on_free")) << getFakeLogPrint(); - ASSERT_EQ(FILL_ON_FREE, config->options); - ASSERT_EQ(SIZE_MAX, config->fill_on_free_bytes); + ASSERT_EQ(FILL_ON_FREE, config->options()); + ASSERT_EQ(SIZE_MAX, config->fill_on_free_bytes()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -343,14 +382,14 @@ TEST_F(MallocDebugConfigTest, fill_on_free) { TEST_F(MallocDebugConfigTest, fill) { ASSERT_TRUE(InitConfig("fill=64")) << getFakeLogPrint(); - ASSERT_EQ(FILL_ON_ALLOC | FILL_ON_FREE, config->options); - ASSERT_EQ(64U, config->fill_on_alloc_bytes); - ASSERT_EQ(64U, config->fill_on_free_bytes); + ASSERT_EQ(FILL_ON_ALLOC | FILL_ON_FREE, config->options()); + ASSERT_EQ(64U, config->fill_on_alloc_bytes()); + ASSERT_EQ(64U, config->fill_on_free_bytes()); ASSERT_TRUE(InitConfig("fill")) << getFakeLogPrint(); - ASSERT_EQ(FILL_ON_ALLOC | FILL_ON_FREE, config->options); - ASSERT_EQ(SIZE_MAX, config->fill_on_alloc_bytes); - ASSERT_EQ(SIZE_MAX, config->fill_on_free_bytes); + ASSERT_EQ(FILL_ON_ALLOC | FILL_ON_FREE, config->options()); + ASSERT_EQ(SIZE_MAX, config->fill_on_alloc_bytes()); + ASSERT_EQ(SIZE_MAX, config->fill_on_free_bytes()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -358,12 +397,12 @@ TEST_F(MallocDebugConfigTest, fill) { TEST_F(MallocDebugConfigTest, expand_alloc) { ASSERT_TRUE(InitConfig("expand_alloc=1234")) << getFakeLogPrint(); - ASSERT_EQ(EXPAND_ALLOC, config->options); - ASSERT_EQ(1234U, config->expand_alloc_bytes); + ASSERT_EQ(EXPAND_ALLOC, config->options()); + ASSERT_EQ(1234U, config->expand_alloc_bytes()); ASSERT_TRUE(InitConfig("expand_alloc")) << getFakeLogPrint(); - ASSERT_EQ(EXPAND_ALLOC, config->options); - ASSERT_EQ(16U, config->expand_alloc_bytes); + ASSERT_EQ(EXPAND_ALLOC, config->options()); + ASSERT_EQ(16U, config->expand_alloc_bytes()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -371,16 +410,16 @@ TEST_F(MallocDebugConfigTest, expand_alloc) { TEST_F(MallocDebugConfigTest, free_track) { ASSERT_TRUE(InitConfig("free_track=1234")) << getFakeLogPrint(); - ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options); - ASSERT_EQ(1234U, config->free_track_allocations); - ASSERT_EQ(SIZE_MAX, config->fill_on_free_bytes); - ASSERT_EQ(16U, config->free_track_backtrace_num_frames); + ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options()); + ASSERT_EQ(1234U, config->free_track_allocations()); + ASSERT_EQ(SIZE_MAX, config->fill_on_free_bytes()); + ASSERT_EQ(16U, config->free_track_backtrace_num_frames()); ASSERT_TRUE(InitConfig("free_track")) << getFakeLogPrint(); - ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options); - ASSERT_EQ(100U, config->free_track_allocations); - ASSERT_EQ(SIZE_MAX, config->fill_on_free_bytes); - ASSERT_EQ(16U, config->free_track_backtrace_num_frames); + ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options()); + ASSERT_EQ(100U, config->free_track_allocations()); + ASSERT_EQ(SIZE_MAX, config->fill_on_free_bytes()); + ASSERT_EQ(16U, config->free_track_backtrace_num_frames()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -388,16 +427,23 @@ TEST_F(MallocDebugConfigTest, free_track) { TEST_F(MallocDebugConfigTest, free_track_and_fill_on_free) { ASSERT_TRUE(InitConfig("free_track=1234 fill_on_free=32")) << getFakeLogPrint(); - ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options); - ASSERT_EQ(1234U, config->free_track_allocations); - ASSERT_EQ(32U, config->fill_on_free_bytes); - ASSERT_EQ(16U, config->free_track_backtrace_num_frames); + ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options()); + ASSERT_EQ(1234U, config->free_track_allocations()); + ASSERT_EQ(32U, config->fill_on_free_bytes()); + ASSERT_EQ(16U, config->free_track_backtrace_num_frames()); ASSERT_TRUE(InitConfig("free_track fill_on_free=60")) << getFakeLogPrint(); - ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options); - ASSERT_EQ(100U, config->free_track_allocations); - ASSERT_EQ(60U, config->fill_on_free_bytes); - ASSERT_EQ(16U, config->free_track_backtrace_num_frames); + ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options()); + ASSERT_EQ(100U, config->free_track_allocations()); + ASSERT_EQ(60U, config->fill_on_free_bytes()); + ASSERT_EQ(16U, config->free_track_backtrace_num_frames()); + + // Now reverse the arguments. + ASSERT_TRUE(InitConfig("fill_on_free=32 free_track=1234")) << getFakeLogPrint(); + ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options()); + ASSERT_EQ(1234U, config->free_track_allocations()); + ASSERT_EQ(32U, config->fill_on_free_bytes()); + ASSERT_EQ(16U, config->free_track_backtrace_num_frames()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -406,12 +452,12 @@ TEST_F(MallocDebugConfigTest, free_track_and_fill_on_free) { TEST_F(MallocDebugConfigTest, free_track_backtrace_num_frames) { ASSERT_TRUE(InitConfig("free_track_backtrace_num_frames=123")) << getFakeLogPrint(); - ASSERT_EQ(0U, config->options); - ASSERT_EQ(123U, config->free_track_backtrace_num_frames); + ASSERT_EQ(0U, config->options()); + ASSERT_EQ(123U, config->free_track_backtrace_num_frames()); ASSERT_TRUE(InitConfig("free_track_backtrace_num_frames")) << getFakeLogPrint(); - ASSERT_EQ(0U, config->options); - ASSERT_EQ(16U, config->free_track_backtrace_num_frames); + ASSERT_EQ(0U, config->options()); + ASSERT_EQ(16U, config->free_track_backtrace_num_frames()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -420,8 +466,8 @@ TEST_F(MallocDebugConfigTest, free_track_backtrace_num_frames) { TEST_F(MallocDebugConfigTest, free_track_backtrace_num_frames_zero) { ASSERT_TRUE(InitConfig("free_track_backtrace_num_frames=0")) << getFakeLogPrint(); - ASSERT_EQ(0U, config->options); - ASSERT_EQ(0U, config->free_track_backtrace_num_frames); + ASSERT_EQ(0U, config->options()); + ASSERT_EQ(0U, config->free_track_backtrace_num_frames()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -429,12 +475,12 @@ TEST_F(MallocDebugConfigTest, free_track_backtrace_num_frames_zero) { TEST_F(MallocDebugConfigTest, free_track_backtrace_num_frames_and_free_track) { ASSERT_TRUE(InitConfig("free_track free_track_backtrace_num_frames=123")) << getFakeLogPrint(); - ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options); - ASSERT_EQ(123U, config->free_track_backtrace_num_frames); + ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options()); + ASSERT_EQ(123U, config->free_track_backtrace_num_frames()); ASSERT_TRUE(InitConfig("free_track free_track_backtrace_num_frames")) << getFakeLogPrint(); - ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options); - ASSERT_EQ(16U, config->free_track_backtrace_num_frames); + ASSERT_EQ(FREE_TRACK | FILL_ON_FREE, config->options()); + ASSERT_EQ(16U, config->free_track_backtrace_num_frames()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -442,7 +488,7 @@ TEST_F(MallocDebugConfigTest, free_track_backtrace_num_frames_and_free_track) { TEST_F(MallocDebugConfigTest, leak_track) { ASSERT_TRUE(InitConfig("leak_track")) << getFakeLogPrint(); - ASSERT_EQ(LEAK_TRACK | TRACK_ALLOCS, config->options); + ASSERT_EQ(LEAK_TRACK | TRACK_ALLOCS, config->options()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -460,14 +506,14 @@ TEST_F(MallocDebugConfigTest, leak_track_fail) { TEST_F(MallocDebugConfigTest, record_allocs) { ASSERT_TRUE(InitConfig("record_allocs=1234")) << getFakeLogPrint(); - ASSERT_EQ(RECORD_ALLOCS, config->options); - ASSERT_EQ(1234U, config->record_allocs_num_entries); - ASSERT_STREQ("/data/local/tmp/record_allocs.txt", config->record_allocs_file.c_str()); + ASSERT_EQ(RECORD_ALLOCS, config->options()); + ASSERT_EQ(1234U, config->record_allocs_num_entries()); + ASSERT_STREQ("/data/local/tmp/record_allocs.txt", config->record_allocs_file().c_str()); ASSERT_TRUE(InitConfig("record_allocs")) << getFakeLogPrint(); - ASSERT_EQ(RECORD_ALLOCS, config->options); - ASSERT_EQ(8000000U, config->record_allocs_num_entries); - ASSERT_STREQ("/data/local/tmp/record_allocs.txt", config->record_allocs_file.c_str()); + ASSERT_EQ(RECORD_ALLOCS, config->options()); + ASSERT_EQ(8000000U, config->record_allocs_num_entries()); + ASSERT_STREQ("/data/local/tmp/record_allocs.txt", config->record_allocs_file().c_str()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); @@ -475,10 +521,10 @@ TEST_F(MallocDebugConfigTest, record_allocs) { TEST_F(MallocDebugConfigTest, record_allocs_file) { ASSERT_TRUE(InitConfig("record_allocs=1234 record_allocs_file=/fake/file")) << getFakeLogPrint(); - ASSERT_STREQ("/fake/file", config->record_allocs_file.c_str()); + ASSERT_STREQ("/fake/file", config->record_allocs_file().c_str()); ASSERT_TRUE(InitConfig("record_allocs_file")) << getFakeLogPrint(); - ASSERT_STREQ("/data/local/tmp/record_allocs.txt", config->record_allocs_file.c_str()); + ASSERT_STREQ("/data/local/tmp/record_allocs.txt", config->record_allocs_file().c_str()); ASSERT_STREQ("", getFakeLogBuf().c_str()); ASSERT_STREQ("", getFakeLogPrint().c_str()); |