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

Merge more tests into modules_{unit,integration}tests.

Browse Source 
A new test target named 'modules_integrationtests' is created
and the following test targets were merged into it:
* audio_coding_module_test
* test_fec
* video_coding_integrationtests
* vp8_integrationtests

A couple of other targets were merged into modules_unittests:
* audio_coding_unittests
* audioproc_unittest
* common_unittests
* video_coding_unittests
* video_processing_unittests
* vp8_unittests

I wasn't able to merge audio_decoder_unittests and neteq_unittests due to
conflicts with different defines in these tests.

Some tests that have special requirements aren't merged into
modules_integrationtests yet. I took the opportunity to rename them
since the bot configs will need to be update anyway:
* audio_device_test_api -> audio_device_integrationtests
* video_capture_module_test -> video_capture_integrationtests
* video_render_module_test -> video_render_integrationtests

Exclude files were added for modules_integrationtests to make sure
the memcheck and tsan bots doesn't tests that are too slow
(audio_coding_module_test and vp8_integrationtests were previously
disabled on those bots).

Suppressions for AudioCodingModuleTest needed to be added to get
modules_integrationtests to pass memcheck (even if the test is
excluded from execution).

BUG=1843
TEST=local execution on Linux and trybots (passing except the merged tests of course)
R=andrew@webrtc.org, tina.legrand@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4228 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org
2013-06-14 20:09:44 +00:00
parent f27389ca9f
commit 63e988856e
16 changed files with 232 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
webrtc/modules/video_coding/codecs/test_framework/test_framework.gypi
View File

@ -7,54 +7,50 @@
# be found in the AUTHORS file in the root of the source tree.
{
'conditions': [
['include_tests==1', {
'targets': [
{
'target_name': 'test_framework',
'type': 'static_library',
'targets': [
{
'target_name': 'test_framework',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/common_video/common_video.gyp:common_video',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/test/metrics.gyp:metrics',
'<(webrtc_root)/test/test.gyp:test_support',
],
'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/common_video/common_video.gyp:common_video',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/test/metrics.gyp:metrics',
'<(webrtc_root)/test/test.gyp:test_support',
],
'include_dirs': [
'../interface',
'<(DEPTH)/testing/gtest/include',
'../../../../common_video/interface',
],
'include_dirs': [
'../interface',
'<(DEPTH)/testing/gtest/include',
'../../../../common_video/interface',
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
],
},
'direct_dependent_settings': {
'include_dirs': [
'../interface',
],
},
'sources': [
# header files
'benchmark.h',
'normal_async_test.h',
'normal_test.h',
'packet_loss_test.h',
'test.h',
'unit_test.h',
'video_source.h',
'sources': [
# header files
'benchmark.h',
'normal_async_test.h',
'normal_test.h',
'packet_loss_test.h',
'test.h',
'unit_test.h',
'video_source.h',
# source files
'benchmark.cc',
'normal_async_test.cc',
'normal_test.cc',
'packet_loss_test.cc',
'test.cc',
'unit_test.cc',
'video_source.cc',
],
},
], # targets
}], # include_tests
], # conditions
# source files
'benchmark.cc',
'normal_async_test.cc',
'normal_test.cc',
'packet_loss_test.cc',
'test.cc',
'unit_test.cc',
'video_source.cc',
],
},
], # targets
}