fix warning in profile-handler unittest
Clang kinda rightfully noticed that if FLAGS_test_profiler_enabled is false (and it never is false in practice), we'd be reading unitialized variables. Since this flag is never updated, we can simply drop those dead "false" paths.
This commit is contained in:
parent
6b8962d797
commit
8899936b77
|
@ -25,11 +25,6 @@
|
|||
#include "base/logging.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
// Do we expect the profiler to be enabled?
|
||||
DEFINE_bool(test_profiler_enabled, true,
|
||||
"expect profiler to be enabled during tests");
|
||||
|
||||
|
||||
// In order to cover fix for github issue at:
|
||||
// https://github.com/gperftools/gperftools/issues/412 we override
|
||||
// operators new/delete to simulate condition where another thread is
|
||||
|
@ -268,14 +263,14 @@ class ProfileHandlerTest : public ::testing::Test {
|
|||
// Check the callback count.
|
||||
EXPECT_GT(GetCallbackCount(), 0);
|
||||
// Check that the profile timer is enabled.
|
||||
EXPECT_EQ(FLAGS_test_profiler_enabled, linux_per_thread_timers_mode_ || IsTimerEnabled());
|
||||
EXPECT_TRUE(linux_per_thread_timers_mode_ || IsTimerEnabled());
|
||||
uint64_t interrupts_before = GetInterruptCount();
|
||||
// Sleep for a bit and check that tick counter is making progress.
|
||||
int old_tick_count = tick_counter;
|
||||
int new_tick_count;
|
||||
uint64_t interrupts_after;
|
||||
Delay(kSleepInterval);
|
||||
if (FLAGS_test_profiler_enabled) {
|
||||
|
||||
// The "sleep" check we do here is somewhat inherently
|
||||
// brittle. But we can repeat waiting a bit more to ensure that
|
||||
// ticks do occur.
|
||||
|
@ -289,10 +284,6 @@ class ProfileHandlerTest : public ::testing::Test {
|
|||
}
|
||||
EXPECT_GT(new_tick_count, old_tick_count);
|
||||
EXPECT_GT(interrupts_after, interrupts_before);
|
||||
} else {
|
||||
EXPECT_EQ(new_tick_count, old_tick_count);
|
||||
EXPECT_EQ(interrupts_after, interrupts_before);
|
||||
}
|
||||
}
|
||||
|
||||
// Verifies that a callback is not receiving profile ticks.
|
||||
|
@ -427,7 +418,7 @@ TEST_F(ProfileHandlerTest, RegisterCallbackBeforeThread) {
|
|||
RegisterCallback(&tick_count);
|
||||
EXPECT_EQ(1, GetCallbackCount());
|
||||
VerifyRegistration(tick_count);
|
||||
EXPECT_EQ(FLAGS_test_profiler_enabled, linux_per_thread_timers_mode_ || IsTimerEnabled());
|
||||
EXPECT_TRUE(linux_per_thread_timers_mode_ || IsTimerEnabled());
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
|
Loading…
Reference in New Issue