From 63e988856ee6fe5999980404c2567f3e2cf759da Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Fri, 14 Jun 2013 20:09:44 +0000 Subject: [PATCH] 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 --- ...odules_integrationtests.gtest-memcheck.txt | 4 + .../modules_integrationtests.gtest-tsan.txt | 7 + .../valgrind-webrtc/memcheck/suppressions.txt | 18 ++ webrtc.gyp | 17 -- .../main/source/audio_coding_module.gypi | 111 ------------ webrtc/modules/audio_device/audio_device.gypi | 2 +- .../audio_processing_tests.gypi | 29 ---- webrtc/modules/modules.gyp | 159 +++++++++++++++++- .../rtp_rtcp/test/testFec/test_fec.gypi | 13 +- .../modules/video_capture/video_capture.gypi | 2 +- .../codecs/test_framework/test_framework.gypi | 86 +++++----- .../modules/video_coding/codecs/vp8/vp8.gyp | 40 ----- .../main/source/video_coding_test.gypi | 55 ------ .../video_processing/main/test/vpm_tests.gypi | 33 ---- webrtc/modules/video_render/video_render.gypi | 2 +- .../source/system_wrappers_tests.gyp | 1 + 16 files changed, 232 insertions(+), 347 deletions(-) create mode 100644 tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-memcheck.txt create mode 100644 tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-tsan.txt delete mode 100644 webrtc/modules/video_processing/main/test/vpm_tests.gypi diff --git a/tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-memcheck.txt b/tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-memcheck.txt new file mode 100644 index 000000000..55c685674 --- /dev/null +++ b/tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-memcheck.txt @@ -0,0 +1,4 @@ +# Tests that are too slow. +AudioCodingModuleTest.TestAllCodecs +AudioCodingModuleTest.RunAllTests +FecTest.FecTest diff --git a/tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-tsan.txt b/tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-tsan.txt new file mode 100644 index 000000000..16e963dc1 --- /dev/null +++ b/tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-tsan.txt @@ -0,0 +1,7 @@ +# Tests that are too slow. +AudioCodingModuleTest.TestAllCodecs +AudioCodingModuleTest.RunAllTests +AudioCodingModuleTest.TestOpus +FecTest.FecTest +TestVp8Impl.BaseUnitTest +VideoProcessorIntegrationTest.ProcessNoLossChangeBitRate diff --git a/tools/valgrind-webrtc/memcheck/suppressions.txt b/tools/valgrind-webrtc/memcheck/suppressions.txt index 4fc354085..fba35ca59 100644 --- a/tools/valgrind-webrtc/memcheck/suppressions.txt +++ b/tools/valgrind-webrtc/memcheck/suppressions.txt @@ -351,3 +351,21 @@ fun:_ZN11ViEAutoTest19ViEFileStandardTestEv fun:_ZN12_GLOBAL__N_157ViEStandardIntegrationTest_RunsFileTestWithoutErrors_Test8TestBodyEv } + +{ + bug_270_1 + Memcheck:Uninitialized + ... + fun:WebRtcNetEQ_RecOutInternal + fun:WebRtcNetEQ_RecOut + ... +} + +{ + bug_270_2 + Memcheck:Uninitialized + fun:WebRtcNetEQ_GetSpeechOutputType + ... +} + + diff --git a/webrtc.gyp b/webrtc.gyp index b9d748f08..4445e82dc 100644 --- a/webrtc.gyp +++ b/webrtc.gyp @@ -39,21 +39,4 @@ ], }, ], - 'conditions': [ - ['include_tests==1', { - 'targets': [ - { - 'target_name': 'common_unittests', - 'type': 'executable', - 'dependencies': [ - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/test/test.gyp:test_support_main', - ], - 'sources': [ - 'webrtc/common_unittest.cc', - ], - }, - ], # targets - }], # include_tests - ], } diff --git a/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi b/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi index 464b35fbf..afe47dc44 100644 --- a/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi +++ b/webrtc/modules/audio_coding/main/source/audio_coding_module.gypi @@ -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 ], }], ], diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi index 6ee3c8d98..54b36d458 100644 --- a/webrtc/modules/audio_device/audio_device.gypi +++ b/webrtc/modules/audio_device/audio_device.gypi @@ -185,7 +185,7 @@ ['include_tests==1', { 'targets': [ { - 'target_name': 'audio_device_test_api', + 'target_name': 'audio_device_integrationtests', 'type': 'executable', 'dependencies': [ 'audio_device', diff --git a/webrtc/modules/audio_processing/audio_processing_tests.gypi b/webrtc/modules/audio_processing/audio_processing_tests.gypi index 9ca8987fd..156a2edfc 100644 --- a/webrtc/modules/audio_processing/audio_processing_tests.gypi +++ b/webrtc/modules/audio_processing/audio_processing_tests.gypi @@ -8,35 +8,6 @@ { 'targets': [ - { - 'target_name': 'audioproc_unittest', - 'type': 'executable', - 'conditions': [ - ['prefer_fixed_point==1', { - 'defines': [ 'WEBRTC_AUDIOPROC_FIXED_PROFILE' ], - }, { - 'defines': [ 'WEBRTC_AUDIOPROC_FLOAT_PROFILE' ], - }], - ['enable_protobuf==1', { - 'defines': [ 'WEBRTC_AUDIOPROC_DEBUG_DUMP' ], - }], - ], - 'dependencies': [ - 'audio_processing', - 'audioproc_unittest_proto', - '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/test/test.gyp:test_support', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'aec/system_delay_unittest.cc', - 'aec/echo_cancellation_unittest.cc', - 'test/unit_test.cc', - 'utility/delay_estimator_unittest.cc', - 'utility/ring_buffer_unittest.cc', - ], - }, { 'target_name': 'audioproc_unittest_proto', 'type': 'static_library', diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index 9193a25dc..6f5111519 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -47,8 +47,8 @@ 'rtp_rtcp/test/testFec/test_fec.gypi', 'video_coding/main/source/video_coding_test.gypi', 'video_coding/codecs/test/video_codecs_test_framework.gypi', + 'video_coding/codecs/test_framework/test_framework.gypi', 'video_coding/codecs/tools/video_codecs_tools.gypi', - 'video_processing/main/test/vpm_tests.gypi', ], # includes 'variables': { 'conditions': [ @@ -65,20 +65,87 @@ 'target_name': 'modules_unittests', 'type': 'executable', 'dependencies': [ + 'audio_coding_module', + 'audio_processing', + 'audioproc_unittest_proto', 'bitrate_controller', + 'CNG', 'desktop_capture', + 'iSACFix', 'media_file', + 'NetEq', + 'NetEq4', + 'NetEq4TestTools', + 'neteq_unittest_tools', 'paced_sender', + 'PCM16B', # Needed by NetEq tests. 'remote_bitrate_estimator', 'rtp_rtcp', + 'test_framework', + 'video_codecs_test_framework', + 'video_processing', 'webrtc_utility', + 'webrtc_video_coding', + '<@(neteq_dependencies)', '<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gtest.gyp:gtest', + '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', + '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/test/test.gyp:test_support_main', ], 'sources': [ - 'module_common_types_unittest.cc', + 'audio_coding/main/source/acm_neteq_unittest.cc', + 'audio_coding/main/source/nack_unittest.cc', + 'audio_coding/codecs/cng/cng_unittest.cc', + 'audio_coding/codecs/isac/fix/source/filters_unittest.cc', + 'audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc', + 'audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc', + 'audio_coding/codecs/isac/fix/source/transform_unittest.cc', + 'audio_coding/codecs/isac/main/source/isac_unittest.cc', + 'audio_coding/codecs/opus/opus_unittest.cc', + 'audio_coding/neteq4/audio_multi_vector_unittest.cc', + 'audio_coding/neteq4/audio_vector_unittest.cc', + 'audio_coding/neteq4/background_noise_unittest.cc', + 'audio_coding/neteq4/buffer_level_filter_unittest.cc', + 'audio_coding/neteq4/comfort_noise_unittest.cc', + 'audio_coding/neteq4/decision_logic_unittest.cc', + 'audio_coding/neteq4/decoder_database_unittest.cc', + 'audio_coding/neteq4/delay_manager_unittest.cc', + 'audio_coding/neteq4/delay_peak_detector_unittest.cc', + 'audio_coding/neteq4/dsp_helper_unittest.cc', + 'audio_coding/neteq4/dtmf_buffer_unittest.cc', + 'audio_coding/neteq4/dtmf_tone_generator_unittest.cc', + 'audio_coding/neteq4/expand_unittest.cc', + 'audio_coding/neteq4/merge_unittest.cc', + 'audio_coding/neteq4/neteq_external_decoder_unittest.cc', + 'audio_coding/neteq4/neteq_impl_unittest.cc', + 'audio_coding/neteq4/neteq_stereo_unittest.cc', + 'audio_coding/neteq4/neteq_unittest.cc', + 'audio_coding/neteq4/normal_unittest.cc', + 'audio_coding/neteq4/packet_buffer_unittest.cc', + 'audio_coding/neteq4/payload_splitter_unittest.cc', + 'audio_coding/neteq4/post_decode_vad_unittest.cc', + 'audio_coding/neteq4/random_vector_unittest.cc', + 'audio_coding/neteq4/sync_buffer_unittest.cc', + 'audio_coding/neteq4/timestamp_scaler_unittest.cc', + 'audio_coding/neteq4/time_stretch_unittest.cc', + 'audio_coding/neteq4/mock/mock_audio_decoder.h', + 'audio_coding/neteq4/mock/mock_audio_vector.h', + 'audio_coding/neteq4/mock/mock_buffer_level_filter.h', + 'audio_coding/neteq4/mock/mock_decoder_database.h', + 'audio_coding/neteq4/mock/mock_delay_manager.h', + 'audio_coding/neteq4/mock/mock_delay_peak_detector.h', + 'audio_coding/neteq4/mock/mock_dtmf_buffer.h', + 'audio_coding/neteq4/mock/mock_dtmf_tone_generator.h', + 'audio_coding/neteq4/mock/mock_external_decoder_pcm16b.h', + 'audio_coding/neteq4/mock/mock_packet_buffer.h', + 'audio_coding/neteq4/mock/mock_payload_splitter.h', + 'audio_processing/aec/system_delay_unittest.cc', + 'audio_processing/aec/echo_cancellation_unittest.cc', + 'audio_processing/test/unit_test.cc', + 'audio_processing/utility/delay_estimator_unittest.cc', + 'audio_processing/utility/ring_buffer_unittest.cc', 'bitrate_controller/bitrate_controller_unittest.cc', 'desktop_capture/desktop_region_unittest.cc', 'desktop_capture/differ_block_unittest.cc', @@ -92,6 +159,7 @@ "desktop_capture/win/cursor_unittest_resources.h", "desktop_capture/win/cursor_unittest_resources.rc", 'media_file/source/media_file_unittest.cc', + 'module_common_types_unittest.cc', 'pacing/paced_sender_unittest.cc', 'remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h', 'remote_bitrate_estimator/bitrate_estimator_unittest.cc', @@ -126,6 +194,33 @@ 'rtp_rtcp/test/testAPI/test_api_rtcp.cc', 'rtp_rtcp/test/testAPI/test_api_video.cc', 'utility/source/audio_frame_operations_unittest.cc', + 'video_coding/codecs/test/packet_manipulator_unittest.cc', + 'video_coding/codecs/test/stats_unittest.cc', + 'video_coding/codecs/test/videoprocessor_unittest.cc', + 'video_coding/codecs/vp8/default_temporal_layers_unittest.cc', + 'video_coding/codecs/vp8/reference_picture_selection_unittest.cc', + 'video_coding/main/interface/mock/mock_vcm_callbacks.h', + 'video_coding/main/source/decoding_state_unittest.cc', + 'video_coding/main/source/jitter_buffer_unittest.cc', + 'video_coding/main/source/receiver_unittest.cc', + 'video_coding/main/source/session_info_unittest.cc', + 'video_coding/main/source/stream_generator.cc', + 'video_coding/main/source/stream_generator.h', + 'video_coding/main/source/timing_unittest.cc', + 'video_coding/main/source/video_coding_robustness_unittest.cc', + 'video_coding/main/source/video_coding_impl_unittest.cc', + 'video_coding/main/source/qm_select_unittest.cc', + 'video_coding/main/test/pcap_file_reader.cc', + 'video_coding/main/test/pcap_file_reader_unittest.cc', + 'video_coding/main/test/rtp_file_reader.cc', + 'video_coding/main/test/rtp_file_reader_unittest.cc', + 'video_processing/main/test/unit_test/brightness_detection_test.cc', + 'video_processing/main/test/unit_test/color_enhancement_test.cc', + 'video_processing/main/test/unit_test/content_metrics_test.cc', + 'video_processing/main/test/unit_test/deflickering_test.cc', + 'video_processing/main/test/unit_test/denoising_test.cc', + 'video_processing/main/test/unit_test/unit_test.cc', + 'video_processing/main/test/unit_test/unit_test.h', ], 'conditions': [ # Run screen/window capturer tests only on platforms where they are @@ -139,12 +234,72 @@ 'desktop_capture/window_capturer_unittest.cc', ], }], + ['prefer_fixed_point==1', { + 'defines': [ 'WEBRTC_AUDIOPROC_FIXED_PROFILE' ], + }, { + 'defines': [ 'WEBRTC_AUDIOPROC_FLOAT_PROFILE' ], + }], + ['enable_protobuf==1', { + 'defines': [ 'WEBRTC_AUDIOPROC_DEBUG_DUMP' ], + }], + ['build_libvpx==1', { + 'dependencies': [ + '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', + ], + }], ], # Disable warnings to enable Win64 build, issue 1323. 'msvs_disabled_warnings': [ 4267, # size_t to int truncation. ], }, + { + 'target_name': 'modules_integrationtests', + 'type': 'executable', + 'dependencies': [ + 'audio_coding_module', + 'rtp_rtcp', + 'test_framework', + 'video_codecs_test_framework', + 'webrtc_utility', + 'webrtc_video_coding', + '<(DEPTH)/testing/gtest.gyp:gtest', + '<(webrtc_root)/common_video/common_video.gyp:common_video', + '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8', + '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/test/metrics.gyp:metrics', + '<(webrtc_root)/test/test.gyp:test_support', + '<(webrtc_root)/test/test.gyp:test_support_main', + ], + 'defines': [ + '<@(audio_coding_defines)', + ], + 'sources': [ + 'audio_coding/main/test/ACMTest.cc', + 'audio_coding/main/test/APITest.cc', + 'audio_coding/main/test/Channel.cc', + 'audio_coding/main/test/dual_stream_unittest.cc', + 'audio_coding/main/test/EncodeDecodeTest.cc', + 'audio_coding/main/test/iSACTest.cc', + 'audio_coding/main/test/opus_test.cc', + 'audio_coding/main/test/PCMFile.cc', + 'audio_coding/main/test/RTPFile.cc', + 'audio_coding/main/test/SpatialAudio.cc', + 'audio_coding/main/test/TestAllCodecs.cc', + 'audio_coding/main/test/target_delay_unittest.cc', + 'audio_coding/main/test/Tester.cc', + 'audio_coding/main/test/TestFEC.cc', + 'audio_coding/main/test/TestStereo.cc', + 'audio_coding/main/test/TestVADDTX.cc', + 'audio_coding/main/test/TimedTrace.cc', + 'audio_coding/main/test/TwoWayCommunication.cc', + 'audio_coding/main/test/initial_delay_unittest.cc', + 'audio_coding/main/test/utility.cc', + 'rtp_rtcp/test/testFec/test_fec.cc', + 'video_coding/codecs/test/videoprocessor_integrationtest.cc', + 'video_coding/codecs/vp8/test/vp8_impl_unittest.cc', + ], + }, ], }], # include_tests ], # conditions diff --git a/webrtc/modules/rtp_rtcp/test/testFec/test_fec.gypi b/webrtc/modules/rtp_rtcp/test/testFec/test_fec.gypi index 7a6c98159..2843894a5 100644 --- a/webrtc/modules/rtp_rtcp/test/testFec/test_fec.gypi +++ b/webrtc/modules/rtp_rtcp/test/testFec/test_fec.gypi @@ -7,18 +7,7 @@ # be found in the AUTHORS file in the root of the source tree. { - 'targets': [{ - 'target_name': 'test_fec', - 'type': 'executable', - 'dependencies': [ - 'rtp_rtcp', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/test/test.gyp:test_support_main', - ], - 'sources': [ - 'test_fec.cc', - ], - }, + 'targets': [ { # The test below takes long to run, no need to add it to any bot. 'target_name': 'test_packet_masks_metrics', diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi index bb45a11da..6e06a170c 100644 --- a/webrtc/modules/video_capture/video_capture.gypi +++ b/webrtc/modules/video_capture/video_capture.gypi @@ -124,7 +124,7 @@ ['include_tests==1', { 'targets': [ { - 'target_name': 'video_capture_module_test', + 'target_name': 'video_capture_integrationtests', 'type': 'executable', 'dependencies': [ 'video_capture_module', diff --git a/webrtc/modules/video_coding/codecs/test_framework/test_framework.gypi b/webrtc/modules/video_coding/codecs/test_framework/test_framework.gypi index 9a94dc3d4..fe509803b 100644 --- a/webrtc/modules/video_coding/codecs/test_framework/test_framework.gypi +++ b/webrtc/modules/video_coding/codecs/test_framework/test_framework.gypi @@ -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 } diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp index bd86390a4..972b38182 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8.gyp +++ b/webrtc/modules/video_coding/codecs/vp8/vp8.gyp @@ -9,7 +9,6 @@ { 'includes': [ '../../../../build/common.gypi', - '../test_framework/test_framework.gypi' ], 'targets': [ { @@ -59,45 +58,6 @@ 'conditions': [ ['include_tests==1', { 'targets': [ - { - 'target_name': 'vp8_integrationtests', - 'type': 'executable', - 'dependencies': [ - 'test_framework', - 'webrtc_vp8', - '<(webrtc_root)/common_video/common_video.gyp:common_video', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/test/test.gyp:test_support', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - # source files - 'test/vp8_impl_unittest.cc', - ], - }, - { - 'target_name': 'vp8_unittests', - 'type': 'executable', - 'dependencies': [ - 'webrtc_vp8', - 'test_framework', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/test/test.gyp:test_support_main', - ], - 'sources': [ - 'default_temporal_layers_unittest.cc', - 'reference_picture_selection_unittest.cc', - ], - 'conditions': [ - ['build_libvpx==1', { - 'dependencies': [ - '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx', - ], - }], - ], - }, { 'target_name': 'vp8_coder', 'type': 'executable', diff --git a/webrtc/modules/video_coding/main/source/video_coding_test.gypi b/webrtc/modules/video_coding/main/source/video_coding_test.gypi index 9ce3d5c5d..fdd026756 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_test.gypi +++ b/webrtc/modules/video_coding/main/source/video_coding_test.gypi @@ -68,60 +68,5 @@ '../test/video_source.cc', ], # sources }, - { - 'target_name': 'video_coding_integrationtests', - 'type': 'executable', - 'dependencies': [ - 'video_codecs_test_framework', - 'webrtc_video_coding', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(webrtc_root)/test/metrics.gyp:metrics', - ], - 'sources': [ - '../../codecs/test/videoprocessor_integrationtest.cc', - ], - }, - { - 'target_name': 'video_coding_unittests', - 'type': 'executable', - 'dependencies': [ - 'rtp_rtcp', - 'video_codecs_test_framework', - 'webrtc_video_coding', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - ], - 'include_dirs': [ - '../../../interface', - '../../codecs/interface', - ], - 'sources': [ - '../interface/mock/mock_vcm_callbacks.h', - 'decoding_state_unittest.cc', - 'jitter_buffer_unittest.cc', - 'receiver_unittest.cc', - 'session_info_unittest.cc', - 'stream_generator.cc', - 'stream_generator.h', - 'timing_unittest.cc', - 'video_coding_robustness_unittest.cc', - 'video_coding_impl_unittest.cc', - 'qm_select_unittest.cc', - '../test/pcap_file_reader.cc', - '../test/pcap_file_reader_unittest.cc', - '../test/rtp_file_reader.cc', - '../test/rtp_file_reader_unittest.cc', - '../../codecs/test/packet_manipulator_unittest.cc', - '../../codecs/test/stats_unittest.cc', - '../../codecs/test/videoprocessor_unittest.cc', - ], - # Disable warnings to enable Win64 build, issue 1323. - 'msvs_disabled_warnings': [ - 4267, # size_t to int truncation. - ], - }, ], } diff --git a/webrtc/modules/video_processing/main/test/vpm_tests.gypi b/webrtc/modules/video_processing/main/test/vpm_tests.gypi deleted file mode 100644 index 0be104c3a..000000000 --- a/webrtc/modules/video_processing/main/test/vpm_tests.gypi +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2011 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. - -{ - 'targets': [ - { - 'target_name': 'video_processing_unittests', - 'type': 'executable', - 'dependencies': [ - 'video_processing', - 'webrtc_utility', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - # headers - 'unit_test/unit_test.h', - # sources - 'unit_test/brightness_detection_test.cc', - 'unit_test/color_enhancement_test.cc', - 'unit_test/content_metrics_test.cc', - 'unit_test/deflickering_test.cc', - 'unit_test/denoising_test.cc', - 'unit_test/unit_test.cc', - ], # sources - }, - ], -} diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi index cb0abadaa..9f6d4864f 100644 --- a/webrtc/modules/video_render/video_render.gypi +++ b/webrtc/modules/video_render/video_render.gypi @@ -160,7 +160,7 @@ ['include_tests==1', { 'targets': [ { - 'target_name': 'video_render_module_test', + 'target_name': 'video_render_integrationtests', 'type': 'executable', 'dependencies': [ 'video_render_module', diff --git a/webrtc/system_wrappers/source/system_wrappers_tests.gyp b/webrtc/system_wrappers/source/system_wrappers_tests.gyp index f036731ae..8dc14b6dc 100644 --- a/webrtc/system_wrappers/source/system_wrappers_tests.gyp +++ b/webrtc/system_wrappers/source/system_wrappers_tests.gyp @@ -18,6 +18,7 @@ '<(webrtc_root)/test/test.gyp:test_support_main', ], 'sources': [ + '../../common_unittest.cc', 'aligned_malloc_unittest.cc', 'clock_unittest.cc', 'condition_variable_unittest.cc',