diff --git a/webrtc/base/profiler_unittest.cc b/webrtc/base/profiler_unittest.cc index 8f4421e9e9..2448fce2de 100644 --- a/webrtc/base/profiler_unittest.cc +++ b/webrtc/base/profiler_unittest.cc @@ -28,7 +28,13 @@ const char* TestFunc() { namespace rtc { -TEST(ProfilerTest, TestFunction) { +// Disable this test due to flakiness; see bug 5947. +#if defined(WEBRTC_LINUX) +#define MAYBE_TestFunction DISABLED_TestFunction +#else +#define MAYBE_TestFunction TestFunction +#endif +TEST(ProfilerTest, MAYBE_TestFunction) { ASSERT_TRUE(Profiler::Instance()->Clear()); // Profile a long-running function.