From 5654b305e55b979851cd82afb4ee756b8ebfbebb Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Tue, 17 Jun 2014 14:37:05 +0000 Subject: [PATCH] Rebase webrtc/base with r6464 version of talk/base: cd webrtc/base svn diff -r 6463:6464 http://webrtc.googlecode.com/svn/trunk/talk/base > 6464.diff patch -p0 -i 6464.diff BUG=3379 TBR=phoglund@webrtc.org Review URL: https://webrtc-codereview.appspot.com/12749005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6466 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/base/profiler_unittest.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webrtc/base/profiler_unittest.cc b/webrtc/base/profiler_unittest.cc index 5a607914a1..8f4421e9e9 100644 --- a/webrtc/base/profiler_unittest.cc +++ b/webrtc/base/profiler_unittest.cc @@ -30,13 +30,15 @@ namespace rtc { TEST(ProfilerTest, TestFunction) { ASSERT_TRUE(Profiler::Instance()->Clear()); + // Profile a long-running function. const char* function_name = TestFunc(); const ProfilerEvent* event = Profiler::Instance()->GetEvent(function_name); ASSERT_TRUE(event != NULL); EXPECT_FALSE(event->is_started()); EXPECT_EQ(1, event->event_count()); - EXPECT_NEAR(kWaitSec, event->mean(), kTolerance); + EXPECT_NEAR(kWaitSec, event->mean(), kTolerance * 3); + // Run it a second time. TestFunc(); EXPECT_FALSE(event->is_started()); @@ -78,7 +80,9 @@ TEST(ProfilerTest, TestScopedEvents) { // Check the result. EXPECT_FALSE(event2->is_started()); EXPECT_EQ(1, event2->event_count()); - EXPECT_NEAR(kEvent2WaitSec, event2->mean(), kTolerance); + + // The difference here can be as much as 0.33, so we need high tolerance. + EXPECT_NEAR(kEvent2WaitSec, event2->mean(), kTolerance * 4); // Make sure event1 is unchanged. EXPECT_FALSE(event1->is_started()); EXPECT_EQ(1, event1->event_count());