diff options
| author | xians@webrtc.org <xians@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-12 14:57:05 +0000 |
|---|---|---|
| committer | xians@webrtc.org <xians@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-06-12 14:57:05 +0000 |
| commit | 890e5875bea3af49a763bd49eba6d55dc4cbd190 (patch) | |
| tree | 7d64645a1943ff060dee025564f59b5d4b0ff9d5 /libjingle_tests.gyp | |
| parent | 75ecb2a27cbb9da53ff201c0216c91065527675e (diff) | |
| download | talk-890e5875bea3af49a763bd49eba6d55dc4cbd190.tar.gz | |
Fixed GetStats when local and remote track are using the same ssrc.
R=hta@chromium.org, kjellander@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/20589004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6414 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'libjingle_tests.gyp')
| -rwxr-xr-x | libjingle_tests.gyp | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/libjingle_tests.gyp b/libjingle_tests.gyp index 9fefa91..00e2230 100755 --- a/libjingle_tests.gyp +++ b/libjingle_tests.gyp @@ -386,20 +386,25 @@ 'target_name': 'libjingle_peerconnection_unittest', 'type': 'executable', 'dependencies': [ + '<(DEPTH)/testing/gmock.gyp:gmock', 'gunit', 'libjingle.gyp:libjingle', 'libjingle.gyp:libjingle_p2p', 'libjingle.gyp:libjingle_peerconnection', 'libjingle_unittest_main', ], - # TODO(ronghuawu): Reenable below unit tests that require gmock. + 'direct_dependent_settings': { + 'include_dirs': [ + '<(DEPTH)/testing/gmock/include', + ], + }, 'sources': [ 'app/webrtc/datachannel_unittest.cc', 'app/webrtc/dtmfsender_unittest.cc', 'app/webrtc/jsepsessiondescription_unittest.cc', 'app/webrtc/localaudiosource_unittest.cc', - # 'app/webrtc/mediastream_unittest.cc', - # 'app/webrtc/mediastreamhandler_unittest.cc', + 'app/webrtc/mediastream_unittest.cc', + 'app/webrtc/mediastreamhandler_unittest.cc', 'app/webrtc/mediastreamsignaling_unittest.cc', 'app/webrtc/peerconnection_unittest.cc', 'app/webrtc/peerconnectionendtoend_unittest.cc', @@ -408,6 +413,7 @@ # 'app/webrtc/peerconnectionproxy_unittest.cc', 'app/webrtc/remotevideocapturer_unittest.cc', 'app/webrtc/sctputils.cc', + 'app/webrtc/statscollector_unittest.cc', 'app/webrtc/test/fakeaudiocapturemodule.cc', 'app/webrtc/test/fakeaudiocapturemodule.h', 'app/webrtc/test/fakeaudiocapturemodule_unittest.cc', @@ -426,6 +432,21 @@ 'app/webrtc/webrtcsdp_unittest.cc', 'app/webrtc/webrtcsession_unittest.cc', ], + 'conditions': [ + ['OS=="android"', { + # We want gmock features that use tr1::tuple, but we currently + # don't support the variadic templates used by libstdc++'s + # implementation. gmock supports this scenario by providing its + # own implementation but we must opt in to it. + 'defines': [ + 'GTEST_USE_OWN_TR1_TUPLE=1', + # GTEST_USE_OWN_TR1_TUPLE only works if GTEST_HAS_TR1_TUPLE is set. + # gmock r625 made it so that GTEST_HAS_TR1_TUPLE is set to 0 + # automatically on android, so it has to be set explicitly here. + 'GTEST_HAS_TR1_TUPLE=1', + ], + }], + ], }, # target libjingle_peerconnection_unittest ], 'conditions': [ |