From 044bdacfefa860715e84663d4df651e8f4984469 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 3 Jun 2014 09:40:01 +0000 Subject: [PATCH] Remove kMaxWaitForStatsMs from tsanv2 compilation. As some tests are #ifdef'd out on THREAD_SANITIZER this constant triggers an unused-const-variable warning which breaks the build. BUG=1205,3220 TBR=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/13579004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6308 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/peerconnection_unittest.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/talk/app/webrtc/peerconnection_unittest.cc b/talk/app/webrtc/peerconnection_unittest.cc index 62b06be76d..a98c256458 100644 --- a/talk/app/webrtc/peerconnection_unittest.cc +++ b/talk/app/webrtc/peerconnection_unittest.cc @@ -84,7 +84,13 @@ using webrtc::SessionDescriptionInterface; using webrtc::StreamCollectionInterface; static const int kMaxWaitMs = 2000; +// Disable for TSan v2, see +// https://code.google.com/p/webrtc/issues/detail?id=1205 for details. +// This declaration is also #ifdef'd as it causes uninitialized-variable +// warnings. +#if !defined(THREAD_SANITIZER) static const int kMaxWaitForStatsMs = 3000; +#endif static const int kMaxWaitForFramesMs = 10000; static const int kEndAudioFrameCount = 3; static const int kEndVideoFrameCount = 3;