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
43 lines
1.3 KiB
Python
43 lines
1.3 KiB
Python
# 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': ['webrtc/build/common.gypi',],
|
|
'variables': {
|
|
'webrtc_all_dependencies': [
|
|
'webrtc/common_audio/common_audio.gyp:*',
|
|
'webrtc/common_video/common_video.gyp:*',
|
|
'webrtc/modules/modules.gyp:*',
|
|
'webrtc/system_wrappers/source/system_wrappers.gyp:*',
|
|
'webrtc/video_engine/video_engine.gyp:*',
|
|
'webrtc/voice_engine/voice_engine.gyp:*',
|
|
'<(webrtc_vp8_dir)/vp8.gyp:*',
|
|
],
|
|
},
|
|
'targets': [
|
|
{
|
|
'target_name': 'All',
|
|
'type': 'none',
|
|
'dependencies': [
|
|
'<@(webrtc_all_dependencies)',
|
|
],
|
|
'conditions': [
|
|
['include_tests==1', {
|
|
'dependencies': [
|
|
'webrtc/system_wrappers/source/system_wrappers_tests.gyp:*',
|
|
'webrtc/test/metrics.gyp:*',
|
|
'webrtc/test/test.gyp:*',
|
|
'webrtc/tools/tools.gyp:*',
|
|
'tools/e2e_quality/e2e_quality.gyp:*',
|
|
],
|
|
}],
|
|
],
|
|
},
|
|
],
|
|
}
|