(Auto)update libjingle 73248599-> 73249894

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6896 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-08-13 21:55:18 +00:00
parent ef8bb8d9b0
commit 449ad98aeb

View File

@ -2397,6 +2397,9 @@ TEST_F(WebRtcVideoMediaChannelTest, SetRecvCodecsUnsupportedCodec) {
EXPECT_FALSE(channel_->SetRecvCodecs(codecs)); EXPECT_FALSE(channel_->SetRecvCodecs(codecs));
} }
// Disable for TSan v2, see
// https://code.google.com/p/webrtc/issues/detail?id=3671 for details.
#if !defined(THREAD_SANITIZER)
TEST_F(WebRtcVideoMediaChannelTest, GetRtpSendTimeExtension) { TEST_F(WebRtcVideoMediaChannelTest, GetRtpSendTimeExtension) {
// Enable RTP timestamp extension. // Enable RTP timestamp extension.
const int id = 12; const int id = 12;
@ -2408,6 +2411,7 @@ TEST_F(WebRtcVideoMediaChannelTest, GetRtpSendTimeExtension) {
EXPECT_TRUE(channel_->SetSendRtpHeaderExtensions(extensions)); EXPECT_TRUE(channel_->SetSendRtpHeaderExtensions(extensions));
EXPECT_EQ(id, channel_->GetRtpSendTimeExtnId()); EXPECT_EQ(id, channel_->GetRtpSendTimeExtnId());
} }
#endif // if !defined(THREAD_SANITIZER)
TEST_F(WebRtcVideoMediaChannelTest, SetSend) { TEST_F(WebRtcVideoMediaChannelTest, SetSend) {
Base::SetSend(); Base::SetSend();