From ba0f0a51d63b99b3de59e18a6b33c9c74e376b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Mon, 5 Oct 2015 10:10:57 +0200 Subject: [PATCH] Disable flaky WebRtcVideoChannel2BaseTest.* on DrMemory/memcheck. BUG=webrtc:4963 R=kjellander@webrtc.org Review URL: https://codereview.webrtc.org/1388693002 . Cr-Commit-Position: refs/heads/master@{#10163} --- ...le_media_unittest.gtest-drmemory_win32.txt | 25 ++----------------- ...ibjingle_media_unittest.gtest-memcheck.txt | 5 ++-- 2 files changed, 4 insertions(+), 26 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 28ad565afa..a6561e91d8 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 @@ -4,25 +4,8 @@ WebRtcVideoChannel2BaseTest.SimulateConference WebRtcVideoChannel2BaseTest.TwoStreamsSendAndReceive WebRtcVideoChannel2BaseTest.TwoStreamsReUseFirstStream -# https://code.google.com/p/webrtc/issues/detail?id=4963 -WebRtcVideoChannel2BaseTest.AdaptResolution16x10 -WebRtcVideoChannel2BaseTest.AdaptResolution4x3 -WebRtcVideoChannel2BaseTest.AddRemoveCapturer -WebRtcVideoChannel2BaseTest.AddRemoveSendStreams -WebRtcVideoChannel2BaseTest.GetStatsMultipleRecvStreams -WebRtcVideoChannel2BaseTest.GetStatsMultipleSendStreams -WebRtcVideoChannel2BaseTest.MuteStream -WebRtcVideoChannel2BaseTest.RemoveCapturerWithoutAdd -WebRtcVideoChannel2BaseTest.SendAndReceiveVp8Vga -WebRtcVideoChannel2BaseTest.SendManyResizeOnce -WebRtcVideoChannel2BaseTest.SetRenderer -WebRtcVideoChannel2BaseTest.SetSend -WebRtcVideoChannel2BaseTest.SetSendSsrc -WebRtcVideoChannel2BaseTest.SetSendSsrcAfterSetCodecs -WebRtcVideoChannel2BaseTest.SetSendStreamFormat0x0 - -# https://code.google.com/p/webrtc/issues/detail?id=3158 -WebRtcVideoMediaChannelTest.SendVp8HdAndReceiveAdaptedVp8Vga +# TODO(pbos): https://code.google.com/p/webrtc/issues/detail?id=4963 +WebRtcVideoChannel2BaseTest.* # https://code.google.com/p/webrtc/issues/detail?id=3482 WebRtcVideoMediaChannelTest.GetStats @@ -34,7 +17,3 @@ 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 69f57cd8be..89c11a373a 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 @@ -4,6 +4,5 @@ WebRtcVideoMediaChannelTest.TwoStreamsSendAndUnsignalledRecv #TODO(jiayl): https://code.google.com/p/webrtc/issues/detail?id=3492 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=4963 +WebRtcVideoChannel2BaseTest.*