From 86136a0e8fe9fcbe0170b7aabd90a6307b61ea3d Mon Sep 17 00:00:00 2001 From: "solenberg@webrtc.org" Date: Mon, 9 Sep 2013 13:06:52 +0000 Subject: [PATCH] Re-enable tests for Remote Bitrate Estimator 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 --- webrtc/modules/modules.gyp | 7 +++++-- .../remote_bitrate_estimator_components.gyp | 20 ------------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index e575fae7e5..6aa100ef37 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -50,7 +50,7 @@ 'video_coding/codecs/test_framework/test_framework.gypi', 'video_coding/codecs/tools/video_codecs_tools.gypi', ], # includes - 'variables': { + 'variables': { 'conditions': [ # Desktop capturer is supported only on Windows, OSX and Linux. ['OS=="win" or OS=="mac" or OS=="linux"', { @@ -87,7 +87,7 @@ 'webrtc_utility', 'webrtc_video_coding', '<@(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/gtest.gyp:gtest', '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', @@ -164,6 +164,9 @@ 'pacing/paced_sender_unittest.cc', 'remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h', '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', 'rtp_rtcp/source/mock/mock_rtp_payload_strategy.h', 'rtp_rtcp/source/fec_receiver_unittest.cc', diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp index 25973ccec1..c5eca05357 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp @@ -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', - ], - }, - ], - }, - ], - ], }