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

Re-enable tests for Remote Bitrate Estimator

Browse Source 
BUG=
R=stefan@webrtc.org, tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2179004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4703 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
solenberg@webrtc.org 2013-09-09 13:06:52 +00:00
parent 0181b5f8dd
commit 86136a0e8f
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/modules/modules.gyp
View File

@ -50,7 +50,7 @@
'video_coding/codecs/test_framework/test_framework.gypi', 'video_coding/codecs/test_framework/test_framework.gypi',
'video_coding/codecs/tools/video_codecs_tools.gypi', 'video_coding/codecs/tools/video_codecs_tools.gypi',
], # includes ], # includes
'variables': { 'variables': {
'conditions': [ 'conditions': [
# Desktop capturer is supported only on Windows, OSX and Linux. # Desktop capturer is supported only on Windows, OSX and Linux.
['OS=="win" or OS=="mac" or OS=="linux"', { ['OS=="win" or OS=="mac" or OS=="linux"', {
@ -87,7 +87,7 @@
'webrtc_utility', 'webrtc_utility',
'webrtc_video_coding', 'webrtc_video_coding',
'<@(neteq_dependencies)', '<@(neteq_dependencies)',
'<(rbe_components_path)/remote_bitrate_estimator_components.gyp:rbe_components_unittests', '<(rbe_components_path)/remote_bitrate_estimator_components.gyp:rbe_components',
'<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
@ -164,6 +164,9 @@
'pacing/paced_sender_unittest.cc', 'pacing/paced_sender_unittest.cc',
'remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h', 'remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h',
'remote_bitrate_estimator/bitrate_estimator_unittest.cc', 'remote_bitrate_estimator/bitrate_estimator_unittest.cc',
'remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc',
'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc',
'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h',
'remote_bitrate_estimator/rtp_to_ntp_unittest.cc', 'remote_bitrate_estimator/rtp_to_ntp_unittest.cc',
'rtp_rtcp/source/mock/mock_rtp_payload_strategy.h', 'rtp_rtcp/source/mock/mock_rtp_payload_strategy.h',
'rtp_rtcp/source/fec_receiver_unittest.cc', 'rtp_rtcp/source/fec_receiver_unittest.cc',

20
webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp
View File

@ -26,24 +26,4 @@
], ],
}, },
], ],
'conditions': [
['include_tests==1', {
'targets': [
{
'target_name': 'rbe_components_unittests',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'sources': [
'<(rbe_components_path)/remote_bitrate_estimator_single_stream_unittest.cc',
'<(rbe_components_path)/remote_bitrate_estimator_unittest_helper.cc',
'<(rbe_components_path)/remote_bitrate_estimator_unittest_helper.h',
],
},
],
},
],
],
} }