summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhenrik.lundin@webrtc.org <henrik.lundin@webrtc.org>2014-11-03 13:38:50 +0000
committerhenrik.lundin@webrtc.org <henrik.lundin@webrtc.org>2014-11-03 13:38:50 +0000
commit9d70622f8a422f18146622ac58930db172f6fd7e (patch)
tree28ecd1a6a0857ab89e889bf6e8492b19e55c6bdc
parent11643cc977452e31faabc19836e41d0924762552 (diff)
downloadtalk-9d70622f8a422f18146622ac58930db172f6fd7e.tar.gz
Disable PeerConnectionEndToEndTest.CreateDataChannelAfterNegotiate under MSan
This test is flaky on MSan bots. BUG=3980 TBR=jiayl@webrtc.org Review URL: https://webrtc-codereview.appspot.com/31889004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7591 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r--app/webrtc/peerconnectionendtoend_unittest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/webrtc/peerconnectionendtoend_unittest.cc b/app/webrtc/peerconnectionendtoend_unittest.cc
index 4db3fe3..d743182 100644
--- a/app/webrtc/peerconnectionendtoend_unittest.cc
+++ b/app/webrtc/peerconnectionendtoend_unittest.cc
@@ -320,7 +320,14 @@ TEST_F(PeerConnectionEndToEndTest, CreateDataChannelBeforeNegotiate) {
// Verifies that a DataChannel created after the negotiation can transition to
// "OPEN" and transfer data.
-TEST_F(PeerConnectionEndToEndTest, CreateDataChannelAfterNegotiate) {
+#if defined(MEMORY_SANITIZER)
+// Fails under MemorySanitizer:
+// See https://code.google.com/p/webrtc/issues/detail?id=3980.
+#define MAYBE_CreateDataChannelAfterNegotiate DISABLED_CreateDataChannelAfterNegotiate
+#else
+#define MAYBE_CreateDataChannelAfterNegotiate CreateDataChannelAfterNegotiate
+#endif
+TEST_F(PeerConnectionEndToEndTest, MAYBE_CreateDataChannelAfterNegotiate) {
MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp);
CreatePcs();