From e2d4da6586516a5154ce9483ad956572a8f61504 Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Wed, 4 Sep 2013 14:21:57 +0000 Subject: [PATCH] Enable EngineTest.ReceivesPliAndRecoversWithNack and fix memcheck suppression filter. BUG=2346 R=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2169004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4677 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../gtest_exclude/video_engine_tests.gtest-memcheck.txt | 2 +- webrtc/video_engine/test/engine_tests.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/valgrind-webrtc/gtest_exclude/video_engine_tests.gtest-memcheck.txt b/tools/valgrind-webrtc/gtest_exclude/video_engine_tests.gtest-memcheck.txt index bdf22fcbd..4289d26a8 100644 --- a/tools/valgrind-webrtc/gtest_exclude/video_engine_tests.gtest-memcheck.txt +++ b/tools/valgrind-webrtc/gtest_exclude/video_engine_tests.gtest-memcheck.txt @@ -1,2 +1,2 @@ # https://code.google.com/p/webrtc/issues/detail?id=2346 -EngineTest.ReceivesPliAndRecoversWithNack +*EngineTest.ReceivesPliAndRecoversWithNack* diff --git a/webrtc/video_engine/test/engine_tests.cc b/webrtc/video_engine/test/engine_tests.cc index bafae1327..61a0f5c2f 100644 --- a/webrtc/video_engine/test/engine_tests.cc +++ b/webrtc/video_engine/test/engine_tests.cc @@ -544,7 +544,7 @@ void EngineTest::ReceivesPliAndRecovers(int rtp_history_ms) { observer.StopSending(); } -TEST_P(EngineTest, DISABLED_ReceivesPliAndRecoversWithNack) { +TEST_P(EngineTest, ReceivesPliAndRecoversWithNack) { ReceivesPliAndRecovers(1000); }