From 96a70f01837a6e655bc46a759a1af95aaf40bfb3 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Mon, 5 Oct 2015 05:42:41 +0200 Subject: [PATCH] Exclude WebRtcVideoChannel2BaseTest.AddRemoveCapturerMultipleSources on Dr Memory. The test is flaky on Dr Memory (not at Linux memcheck as previously committed in https://codereview.webrtc.org/1388663002). BUG=5050 TBR=pbos@webrtc.org Review URL: https://codereview.webrtc.org/1377183004 . Cr-Commit-Position: refs/heads/master@{#10161} --- .../libjingle_media_unittest.gtest-drmemory_win32.txt | 4 ++++ .../gtest_exclude/libjingle_media_unittest.gtest-memcheck.txt | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-drmemory_win32.txt b/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-drmemory_win32.txt index cb36e9a3c5..28ad565afa 100644 --- a/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-drmemory_win32.txt +++ b/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-drmemory_win32.txt @@ -34,3 +34,7 @@ SctpDataMediaChannelTest.* # https://code.google.com/p/webrtc/issues/detail?id=3771 VideoAdapterTest.AdaptResolutionWide VideoAdapterTest.AdaptResolutionNarrow + +# TODO(pbos): https://code.google.com/p/webrtc/issues/detail?id=5050 +WebRtcVideoChannel2BaseTest.AddRemoveCapturerMultipleSources + diff --git a/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-memcheck.txt b/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-memcheck.txt index 01c079e7fe..69f57cd8be 100644 --- a/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-memcheck.txt +++ b/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-memcheck.txt @@ -7,6 +7,3 @@ SctpDataMediaChannelTest.* #TODO(pbos): https://code.google.com/p/webrtc/issues/detail?id=5048 WebRtcVideoChannel2BaseTest.GetStats -# TODO(pbos): https://code.google.com/p/webrtc/issues/detail?id=5050 -WebRtcVideoChannel2BaseTest.AddRemoveCapturerMultipleSources -