From 2236267b5ef06bf16dd3d09df094103ac502260f Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Mon, 3 Nov 2014 13:38:50 +0000 Subject: [PATCH] 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@7591 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/peerconnectionendtoend_unittest.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/talk/app/webrtc/peerconnectionendtoend_unittest.cc b/talk/app/webrtc/peerconnectionendtoend_unittest.cc index 4db3fe348..d743182f6 100644 --- a/talk/app/webrtc/peerconnectionendtoend_unittest.cc +++ b/talk/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();