generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebase webrtc/base with r6464 version of talk/base:

Browse Source 
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
This commit is contained in:
henrike@webrtc.org 2014-06-17 14:37:05 +00:00
parent d469443959
commit 5654b305e5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/base/profiler_unittest.cc
View File

@ -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());