From b70c8e9dfdffdf77ee433e0b22a813e239525626 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Mon, 24 Mar 2014 20:57:42 +0000 Subject: [PATCH] Disable flaky WebRtcVideoMediaChannelTests on memcheck and tsan. BUG=3096 R=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/10579004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5766 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../libjingle_media_unittest.gtest-memcheck.txt | 2 ++ .../gtest_exclude/libjingle_media_unittest.gtest-tsan.txt | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-memcheck.txt 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 new file mode 100644 index 0000000000..4727c59ebb --- /dev/null +++ b/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-memcheck.txt @@ -0,0 +1,2 @@ +TODO(wu): https://code.google.com/p/webrtc/issues/detail?id=2380 +WebRtcVideoMediaChannelTest.TwoStreamsSendAndUnsignalledRecv \ No newline at end of file diff --git a/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-tsan.txt b/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-tsan.txt index 6390b182a2..1c8c1aeaf6 100644 --- a/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-tsan.txt +++ b/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-tsan.txt @@ -1,4 +1,6 @@ -TODO(wu): issue 2380 -WebRtcVideoMediaChannelTest.TwoStreamsSendAndReceive +TODO(wu): https://code.google.com/p/webrtc/issues/detail?id=2380 +WebRtcVideoMediaChannelTest.TwoStreamsAddAndRemoveUnsignalledRecv WebRtcVideoMediaChannelTest.TwoStreamsReUseFirstStream +WebRtcVideoMediaChannelTest.TwoStreamsSendAndFailUnsignalledRecv +WebRtcVideoMediaChannelTest.TwoStreamsSendAndReceive WebRtcVideoMediaChannelTest.TwoStreamsSendAndUnsignalledRecv