generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove kMaxWaitForStatsMs from tsanv2 compilation.

Browse Source 
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
This commit is contained in:
pbos@webrtc.org 2014-06-03 09:40:01 +00:00
parent c0035a67a1
commit 044bdacfef
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
talk/app/webrtc/peerconnection_unittest.cc
View File

@ -84,7 +84,13 @@ using webrtc::SessionDescriptionInterface;
using webrtc::StreamCollectionInterface; using webrtc::StreamCollectionInterface;
static const int kMaxWaitMs = 2000; 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; static const int kMaxWaitForStatsMs = 3000;
#endif
static const int kMaxWaitForFramesMs = 10000; static const int kMaxWaitForFramesMs = 10000;
static const int kEndAudioFrameCount = 3; static const int kEndAudioFrameCount = 3;
static const int kEndVideoFrameCount = 3; static const int kEndVideoFrameCount = 3;