Merge more tests into modules_{unit,integration}tests.
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
@@ -111,45 +111,6 @@
|
||||
'conditions': [
|
||||
['include_tests==1', {
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'audio_coding_module_test',
|
||||
'type': 'executable',
|
||||
'dependencies': [
|
||||
'audio_coding_module',
|
||||
'<(webrtc_root)/test/test.gyp:test_support_main',
|
||||
'<(DEPTH)/testing/gtest.gyp:gtest',
|
||||
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
||||
'<(webrtc_root)/modules/modules.gyp:webrtc_utility',
|
||||
],
|
||||
'include_dirs': [
|
||||
'<(webrtc_root)/common_audio/resampler/include',
|
||||
],
|
||||
'defines': [
|
||||
'<@(audio_coding_defines)',
|
||||
],
|
||||
'sources': [
|
||||
'../test/ACMTest.cc',
|
||||
'../test/APITest.cc',
|
||||
'../test/Channel.cc',
|
||||
'../test/dual_stream_unittest.cc',
|
||||
'../test/EncodeDecodeTest.cc',
|
||||
'../test/iSACTest.cc',
|
||||
'../test/opus_test.cc',
|
||||
'../test/PCMFile.cc',
|
||||
'../test/RTPFile.cc',
|
||||
'../test/SpatialAudio.cc',
|
||||
'../test/TestAllCodecs.cc',
|
||||
'../test/target_delay_unittest.cc',
|
||||
'../test/Tester.cc',
|
||||
'../test/TestFEC.cc',
|
||||
'../test/TestStereo.cc',
|
||||
'../test/TestVADDTX.cc',
|
||||
'../test/TimedTrace.cc',
|
||||
'../test/TwoWayCommunication.cc',
|
||||
'../test/initial_delay_unittest.cc',
|
||||
'../test/utility.cc',
|
||||
],
|
||||
},
|
||||
{
|
||||
'target_name': 'delay_test',
|
||||
'type': 'executable',
|
||||
@@ -182,78 +143,6 @@
|
||||
'../test/PCMFile.cc',
|
||||
],
|
||||
}, # delay_test
|
||||
{
|
||||
'target_name': 'audio_coding_unittests',
|
||||
'type': 'executable',
|
||||
'dependencies': [
|
||||
'audio_coding_module',
|
||||
'CNG',
|
||||
'iSACFix',
|
||||
'NetEq',
|
||||
'NetEq4',
|
||||
'NetEq4TestTools',
|
||||
'neteq_unittest_tools',
|
||||
'PCM16B', # Needed by NetEq tests.
|
||||
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
|
||||
'<(DEPTH)/testing/gmock.gyp:gmock',
|
||||
'<(DEPTH)/testing/gtest.gyp:gtest',
|
||||
'<(webrtc_root)/test/test.gyp:test_support_main',
|
||||
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
||||
],
|
||||
'sources': [
|
||||
'acm_neteq_unittest.cc',
|
||||
'nack_unittest.cc',
|
||||
'../../codecs/cng/cng_unittest.cc',
|
||||
'../../codecs/isac/fix/source/filters_unittest.cc',
|
||||
'../../codecs/isac/fix/source/filterbanks_unittest.cc',
|
||||
'../../codecs/isac/fix/source/lpc_masking_model_unittest.cc',
|
||||
'../../codecs/isac/fix/source/transform_unittest.cc',
|
||||
'../../codecs/isac/main/source/isac_unittest.cc',
|
||||
'../../codecs/opus/opus_unittest.cc',
|
||||
# Test for NetEq 4.
|
||||
'../../neteq4/audio_multi_vector_unittest.cc',
|
||||
'../../neteq4/audio_vector_unittest.cc',
|
||||
'../../neteq4/background_noise_unittest.cc',
|
||||
'../../neteq4/buffer_level_filter_unittest.cc',
|
||||
'../../neteq4/comfort_noise_unittest.cc',
|
||||
'../../neteq4/decision_logic_unittest.cc',
|
||||
'../../neteq4/decoder_database_unittest.cc',
|
||||
'../../neteq4/delay_manager_unittest.cc',
|
||||
'../../neteq4/delay_peak_detector_unittest.cc',
|
||||
'../../neteq4/dsp_helper_unittest.cc',
|
||||
'../../neteq4/dtmf_buffer_unittest.cc',
|
||||
'../../neteq4/dtmf_tone_generator_unittest.cc',
|
||||
'../../neteq4/expand_unittest.cc',
|
||||
'../../neteq4/merge_unittest.cc',
|
||||
'../../neteq4/neteq_external_decoder_unittest.cc',
|
||||
'../../neteq4/neteq_impl_unittest.cc',
|
||||
'../../neteq4/neteq_stereo_unittest.cc',
|
||||
'../../neteq4/neteq_unittest.cc',
|
||||
'../../neteq4/normal_unittest.cc',
|
||||
'../../neteq4/packet_buffer_unittest.cc',
|
||||
'../../neteq4/payload_splitter_unittest.cc',
|
||||
'../../neteq4/post_decode_vad_unittest.cc',
|
||||
'../../neteq4/random_vector_unittest.cc',
|
||||
'../../neteq4/sync_buffer_unittest.cc',
|
||||
'../../neteq4/timestamp_scaler_unittest.cc',
|
||||
'../../neteq4/time_stretch_unittest.cc',
|
||||
'../../neteq4/mock/mock_audio_decoder.h',
|
||||
'../../neteq4/mock/mock_audio_vector.h',
|
||||
'../../neteq4/mock/mock_buffer_level_filter.h',
|
||||
'../../neteq4/mock/mock_decoder_database.h',
|
||||
'../../neteq4/mock/mock_delay_manager.h',
|
||||
'../../neteq4/mock/mock_delay_peak_detector.h',
|
||||
'../../neteq4/mock/mock_dtmf_buffer.h',
|
||||
'../../neteq4/mock/mock_dtmf_tone_generator.h',
|
||||
'../../neteq4/mock/mock_external_decoder_pcm16b.h',
|
||||
'../../neteq4/mock/mock_packet_buffer.h',
|
||||
'../../neteq4/mock/mock_payload_splitter.h',
|
||||
],
|
||||
# Disable warnings to enable Win64 build, issue 1323.
|
||||
'msvs_disabled_warnings': [
|
||||
4267, # size_t to int truncation.
|
||||
],
|
||||
}, # audio_coding_unittests
|
||||
],
|
||||
}],
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user