zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove 'video_engine_core_unittests' binary.

Browse Source 
Merges tests into 'video_engine_tests' to reduce the number of test
targets.

BUG=webrtc:1695
R=kjellander@webrtc.org, phoglund@webrtc.org

Review URL: https://codereview.webrtc.org/1409803007 .

Cr-Commit-Position: refs/heads/master@{#10891}
This commit is contained in:
Peter Boström
2015-12-04 10:58:54 +01:00
parent ff24c04c73
commit bc32ab458b
7 changed files with 8 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/build/android/test_runner.py
View File

@ -48,8 +48,6 @@ def main():
'video_capture_tests':
'webrtc/modules/video_capture/video_capture_tests.isolate',
'video_engine_tests': 'webrtc/video_engine_tests.isolate',
'video_engine_core_unittests':
'webrtc/video_engine/video_engine_core_unittests.isolate',
'voice_engine_unittests':
'webrtc/voice_engine/voice_engine_unittests.isolate',
'webrtc_nonparallel_tests': 'webrtc/webrtc_nonparallel_tests.isolate',

14
webrtc/build/apk_tests.gyp
View File

@ -145,20 +145,6 @@
'../../build/apk_test.gypi',
],
},
{
'target_name': 'video_engine_core_unittests_apk',
'type': 'none',
'variables': {
'test_suite_name': 'video_engine_core_unittests',
'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)video_engine_core_unittests<(SHARED_LIB_SUFFIX)',
},
'dependencies': [
'<(webrtc_root)/video_engine/video_engine_core_unittests.gyp:video_engine_core_unittests',
],
'includes': [
'../../build/apk_test.gypi',
],
},
{
'target_name': 'video_engine_tests_apk',
'type': 'none',

4
webrtc/build/apk_tests_noop.gyp
View File

@ -45,10 +45,6 @@
'target_name': 'tools_unittests_apk',
'type': 'none',
},
{
'target_name': 'video_engine_core_unittests_apk',
'type': 'none',
},
{
'target_name': 'video_engine_tests_apk',
'type': 'none',

74
webrtc/video_engine/video_engine_core_unittests.gyp
View File

@ -1,74 +0,0 @@
# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../build/common.gypi',
],
'targets': [
{
'target_name': 'video_engine_core_unittests',
'type': '<(gtest_target_type)',
'dependencies': [
'<(webrtc_root)/webrtc.gyp:webrtc',
'<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',
'<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
'sources': [
'call_stats_unittest.cc',
'encoder_state_feedback_unittest.cc',
'overuse_frame_detector_unittest.cc',
'payload_router_unittest.cc',
'report_block_stats_unittest.cc',
'stream_synchronization_unittest.cc',
'vie_codec_unittest.cc',
'vie_remb_unittest.cc',
],
'conditions': [
['OS=="android"', {
'dependencies': [
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
],
}],
],
},
], # targets
'conditions': [
['OS=="android"', {
'targets': [
{
'target_name': 'video_engine_core_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):video_engine_core_unittests_apk',
],
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'video_engine_core_unittests_run',
'type': 'none',
'dependencies': [
'video_engine_core_unittests',
],
'includes': [
'../build/isolate.gypi',
],
'sources': [
'video_engine_core_unittests.isolate',
],
},
],
}],
],
}

23
webrtc/video_engine/video_engine_core_unittests.isolate
View File

@ -1,23 +0,0 @@
# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'command': [
'<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)',
],
'files': [
'<(DEPTH)/testing/test_env.py',
'<(PRODUCT_DIR)/video_engine_core_unittests<(EXECUTABLE_SUFFIX)',
],
},
}],
],
}

1
webrtc/webrtc.gyp
View File

@ -86,7 +86,6 @@
'test/metrics.gyp:*',
'test/test.gyp:*',
'test/webrtc_test_common.gyp:*',
'video_engine/video_engine_core_unittests.gyp:*',
'webrtc_tests',
],
}],

8
webrtc/webrtc_tests.gypi
View File

@ -166,6 +166,14 @@
'video/video_decoder_unittest.cc',
'video/video_encoder_unittest.cc',
'video/video_send_stream_tests.cc',
'video_engine/call_stats_unittest.cc',
'video_engine/encoder_state_feedback_unittest.cc',
'video_engine/overuse_frame_detector_unittest.cc',
'video_engine/payload_router_unittest.cc',
'video_engine/report_block_stats_unittest.cc',
'video_engine/stream_synchronization_unittest.cc',
'video_engine/vie_codec_unittest.cc',
'video_engine/vie_remb_unittest.cc',
],
'dependencies': [
'<(DEPTH)/testing/gmock.gyp:gmock',