From f22695c3d80b7b28fa3d7cb65cfda1af3d3eab16 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Thu, 19 Nov 2015 15:39:29 +0100 Subject: [PATCH] Remove build_with_libjingle and exclude failing iOS tests from 'All' target. This will make it possible to remove the build_with_libjingle=1 and key='' GYP_DEFINES the bots are using (https://codereview.chromium.org/1450313002/). It will also pave the road for enabling more WebRTC native tests on iOS. BUG=webrtc:4755,webrtc:3185,webrtc:5165 TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc Local compilation with: GYP_DEFINES='OS=ios target_arch=arm' webrtc/build/gyp_webrtc ninja -C out/Release-iphoneos GYP_DEFINES='OS=ios target_arch=arm chromium_ios_signing=0' webrtc/build/gyp_webrtc ninja -C out/Release-iphoneos GYP_DEFINES='OS=ios target_arch=arm64' webrtc/build/gyp_webrtc ninja -C out/Release-iphoneos GYP_DEFINES='OS=ios target_arch=ia32' webrtc/build/gyp_webrtc ninja -C out/Release-iphonesimulator GYP_DEFINES='OS=ios target_arch=x64' webrtc/build/gyp_webrtc ninja -C out/Release-iphonesimulator R=henrika@webrtc.org Review URL: https://codereview.webrtc.org/1457053003 . Cr-Commit-Position: refs/heads/master@{#10711} --- webrtc/build/common.gypi | 13 +- webrtc/common_audio/common_audio.gyp | 3 +- webrtc/modules/audio_device/audio_device.gypi | 5 +- webrtc/modules/modules.gyp | 709 +++++++++--------- webrtc/modules/video_render/video_render.gypi | 5 +- webrtc/voice_engine/voice_engine.gyp | 164 ++-- 6 files changed, 453 insertions(+), 446 deletions(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index bcd740ee60..d021b01662 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -21,12 +21,10 @@ 'conditions': [ ['build_with_chromium==1', { - 'build_with_libjingle': 1, 'webrtc_root%': '<(DEPTH)/third_party/webrtc', 'apk_tests_path%': '<(DEPTH)/third_party/webrtc/build/apk_tests_noop.gyp', 'modules_java_gyp_path%': '<(DEPTH)/third_party/webrtc/modules/modules_java_chromium.gyp', }, { - 'build_with_libjingle%': 0, 'webrtc_root%': '<(DEPTH)/webrtc', 'apk_tests_path%': '<(DEPTH)/webrtc/build/apk_tests.gyp', 'modules_java_gyp_path%': '<(DEPTH)/webrtc/modules/modules_java.gyp', @@ -34,7 +32,6 @@ ], }, 'build_with_chromium%': '<(build_with_chromium)', - 'build_with_libjingle%': '<(build_with_libjingle)', 'webrtc_root%': '<(webrtc_root)', 'apk_tests_path%': '<(apk_tests_path)', 'modules_java_gyp_path%': '<(modules_java_gyp_path)', @@ -47,7 +44,6 @@ 'build_with_mozilla%': 0, }, 'build_with_chromium%': '<(build_with_chromium)', - 'build_with_libjingle%': '<(build_with_libjingle)', 'build_with_mozilla%': '<(build_with_mozilla)', 'webrtc_root%': '<(webrtc_root)', 'apk_tests_path%': '<(apk_tests_path)', @@ -135,6 +131,10 @@ # Exclude internal ADM since Chromium uses its own IO handling. 'include_internal_audio_device%': 0, + + # Remove tests for Chromium to avoid slowing down GYP generation. + 'include_tests%': 0, + 'restrict_webrtc_logging%': 1, }, { # Settings for the standalone (not-in-Chromium) build. # TODO(andrew): For now, disable the Chrome plugins, which causes a # flood of chromium-style warnings. Investigate enabling them: @@ -143,11 +143,6 @@ 'include_pulse_audio%': 1, 'include_internal_audio_device%': 1, - }], - ['build_with_libjingle==1', { - 'include_tests%': 0, - 'restrict_webrtc_logging%': 1, - }, { 'include_tests%': 1, 'restrict_webrtc_logging%': 0, }], diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp index 43c7ac52c5..f0a6fc9473 100644 --- a/webrtc/common_audio/common_audio.gyp +++ b/webrtc/common_audio/common_audio.gyp @@ -228,9 +228,10 @@ }, ], # targets }], - ['include_tests==1', { + ['include_tests==1 and OS!="ios"', { 'targets' : [ { + # Does not compile on iOS: webrtc:4755. 'target_name': 'common_audio_unittests', 'type': '<(gtest_target_type)', 'dependencies': [ diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi index c3b6fbaa46..480276836b 100644 --- a/webrtc/modules/audio_device/audio_device.gypi +++ b/webrtc/modules/audio_device/audio_device.gypi @@ -200,7 +200,8 @@ }, ], 'conditions': [ - ['include_tests==1', { + # Does not compile on iOS: webrtc:4755. + ['include_tests==1 and OS!="ios"', { 'targets': [ { 'target_name': 'audio_device_tests', @@ -236,7 +237,7 @@ ], }, ], # targets - }], # include_tests + }], # include_tests==1 and OS!=ios ], } diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index 59c4b7a558..44cf73e05c 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -48,358 +48,6 @@ ], }, 'targets': [ - { - 'target_name': 'modules_unittests', - 'type': '<(gtest_target_type)', - 'defines': [ - '<@(audio_coding_defines)', - ], - 'dependencies': [ - 'acm_receive_test', - 'acm_send_test', - 'audio_coding_module', - 'audio_conference_mixer', - 'audio_device' , - 'audio_processing', - 'audioproc_test_utils', - 'bitrate_controller', - 'bwe_simulator', - 'cng', - 'desktop_capture', - 'isac_fix', - 'media_file', - 'neteq', - 'neteq_test_support', - 'neteq_unittest_tools', - 'paced_sender', - 'pcm16b', # Needed by NetEq tests. - 'red', - 'remote_bitrate_estimator', - 'rtp_rtcp', - 'video_codecs_test_framework', - 'video_processing', - 'webrtc_utility', - 'webrtc_video_coding', - '<@(neteq_dependencies)', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - '<(webrtc_root)/common.gyp:webrtc_common', - '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/modules/modules.gyp:video_capture', - '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8', - '<(webrtc_root)/modules/video_coding/codecs/vp9/vp9.gyp:webrtc_vp9', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/test/test.gyp:frame_generator', - '<(webrtc_root)/test/test.gyp:rtp_test_utils', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common', - '<(webrtc_root)/tools/tools.gyp:agc_test_utils', - ], - 'sources': [ - 'audio_coding/codecs/cng/audio_encoder_cng_unittest.cc', - 'audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc', - 'audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc', - 'audio_coding/main/acm2/call_statistics_unittest.cc', - 'audio_coding/main/acm2/codec_manager_unittest.cc', - 'audio_coding/main/acm2/initial_delay_manager_unittest.cc', - 'audio_coding/main/acm2/rent_a_codec_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/audio_encoder_isac_unittest.cc', - 'audio_coding/codecs/isac/main/source/isac_unittest.cc', - 'audio_coding/codecs/isac/unittest.cc', - 'audio_coding/codecs/opus/audio_encoder_opus_unittest.cc', - 'audio_coding/codecs/opus/opus_unittest.cc', - 'audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc', - 'audio_coding/neteq/audio_classifier_unittest.cc', - 'audio_coding/neteq/audio_multi_vector_unittest.cc', - 'audio_coding/neteq/audio_vector_unittest.cc', - 'audio_coding/neteq/background_noise_unittest.cc', - 'audio_coding/neteq/buffer_level_filter_unittest.cc', - 'audio_coding/neteq/comfort_noise_unittest.cc', - 'audio_coding/neteq/decision_logic_unittest.cc', - 'audio_coding/neteq/decoder_database_unittest.cc', - 'audio_coding/neteq/delay_manager_unittest.cc', - 'audio_coding/neteq/delay_peak_detector_unittest.cc', - 'audio_coding/neteq/dsp_helper_unittest.cc', - 'audio_coding/neteq/dtmf_buffer_unittest.cc', - 'audio_coding/neteq/dtmf_tone_generator_unittest.cc', - 'audio_coding/neteq/expand_unittest.cc', - 'audio_coding/neteq/merge_unittest.cc', - 'audio_coding/neteq/nack_unittest.cc', - 'audio_coding/neteq/neteq_external_decoder_unittest.cc', - 'audio_coding/neteq/neteq_impl_unittest.cc', - 'audio_coding/neteq/neteq_network_stats_unittest.cc', - 'audio_coding/neteq/neteq_stereo_unittest.cc', - 'audio_coding/neteq/neteq_unittest.cc', - 'audio_coding/neteq/normal_unittest.cc', - 'audio_coding/neteq/packet_buffer_unittest.cc', - 'audio_coding/neteq/payload_splitter_unittest.cc', - 'audio_coding/neteq/post_decode_vad_unittest.cc', - 'audio_coding/neteq/random_vector_unittest.cc', - 'audio_coding/neteq/sync_buffer_unittest.cc', - 'audio_coding/neteq/timestamp_scaler_unittest.cc', - 'audio_coding/neteq/time_stretch_unittest.cc', - 'audio_coding/neteq/mock/mock_audio_decoder.h', - 'audio_coding/neteq/mock/mock_audio_vector.h', - 'audio_coding/neteq/mock/mock_buffer_level_filter.h', - 'audio_coding/neteq/mock/mock_decoder_database.h', - 'audio_coding/neteq/mock/mock_delay_manager.h', - 'audio_coding/neteq/mock/mock_delay_peak_detector.h', - 'audio_coding/neteq/mock/mock_dtmf_buffer.h', - 'audio_coding/neteq/mock/mock_dtmf_tone_generator.h', - 'audio_coding/neteq/mock/mock_expand.h', - 'audio_coding/neteq/mock/mock_external_decoder_pcm16b.h', - 'audio_coding/neteq/mock/mock_packet_buffer.h', - 'audio_coding/neteq/mock/mock_payload_splitter.h', - 'audio_coding/neteq/tools/input_audio_file_unittest.cc', - 'audio_coding/neteq/tools/packet_unittest.cc', - 'audio_conference_mixer/test/audio_conference_mixer_unittest.cc', - 'audio_device/fine_audio_buffer_unittest.cc', - 'audio_processing/aec/echo_cancellation_unittest.cc', - 'audio_processing/aec/system_delay_unittest.cc', - 'audio_processing/agc/agc_manager_direct_unittest.cc', - # TODO(ajm): Fix to match new interface. - # 'audio_processing/agc/agc_unittest.cc', - 'audio_processing/agc/histogram_unittest.cc', - 'audio_processing/agc/mock_agc.h', - 'audio_processing/beamformer/array_util_unittest.cc', - 'audio_processing/beamformer/complex_matrix_unittest.cc', - 'audio_processing/beamformer/covariance_matrix_generator_unittest.cc', - 'audio_processing/beamformer/matrix_unittest.cc', - 'audio_processing/beamformer/mock_nonlinear_beamformer.h', - 'audio_processing/beamformer/nonlinear_beamformer_unittest.cc', - 'audio_processing/echo_cancellation_impl_unittest.cc', - 'audio_processing/intelligibility/intelligibility_enhancer_unittest.cc', - 'audio_processing/intelligibility/intelligibility_utils_unittest.cc', - 'audio_processing/splitting_filter_unittest.cc', - 'audio_processing/transient/dyadic_decimator_unittest.cc', - 'audio_processing/transient/file_utils.cc', - 'audio_processing/transient/file_utils.h', - 'audio_processing/transient/file_utils_unittest.cc', - 'audio_processing/transient/moving_moments_unittest.cc', - 'audio_processing/transient/transient_detector_unittest.cc', - 'audio_processing/transient/transient_suppressor_unittest.cc', - 'audio_processing/transient/wpd_node_unittest.cc', - 'audio_processing/transient/wpd_tree_unittest.cc', - 'audio_processing/utility/delay_estimator_unittest.cc', - 'audio_processing/vad/gmm_unittest.cc', - 'audio_processing/vad/pitch_based_vad_unittest.cc', - 'audio_processing/vad/pitch_internal_unittest.cc', - 'audio_processing/vad/pole_zero_filter_unittest.cc', - 'audio_processing/vad/standalone_vad_unittest.cc', - 'audio_processing/vad/vad_audio_proc_unittest.cc', - 'audio_processing/vad/vad_circular_buffer_unittest.cc', - 'audio_processing/vad/voice_activity_detector_unittest.cc', - 'bitrate_controller/bitrate_controller_unittest.cc', - 'bitrate_controller/send_side_bandwidth_estimation_unittest.cc', - 'desktop_capture/desktop_and_cursor_composer_unittest.cc', - 'desktop_capture/desktop_region_unittest.cc', - 'desktop_capture/differ_block_unittest.cc', - 'desktop_capture/differ_unittest.cc', - 'desktop_capture/mouse_cursor_monitor_unittest.cc', - 'desktop_capture/screen_capturer_helper_unittest.cc', - 'desktop_capture/screen_capturer_mac_unittest.cc', - 'desktop_capture/screen_capturer_mock_objects.h', - 'desktop_capture/screen_capturer_unittest.cc', - 'desktop_capture/window_capturer_unittest.cc', - 'desktop_capture/win/cursor_unittest.cc', - 'desktop_capture/win/cursor_unittest_resources.h', - 'desktop_capture/win/cursor_unittest_resources.rc', - 'media_file/media_file_unittest.cc', - 'module_common_types_unittest.cc', - 'pacing/bitrate_prober_unittest.cc', - 'pacing/paced_sender_unittest.cc', - 'pacing/packet_router_unittest.cc', - 'remote_bitrate_estimator/bwe_simulations.cc', - 'remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h', - 'remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h', - 'remote_bitrate_estimator/inter_arrival_unittest.cc', - 'remote_bitrate_estimator/overuse_detector_unittest.cc', - 'remote_bitrate_estimator/rate_statistics_unittest.cc', - 'remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc', - 'remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc', - 'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc', - 'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h', - 'remote_bitrate_estimator/remote_estimator_proxy_unittest.cc', - 'remote_bitrate_estimator/send_time_history_unittest.cc', - 'remote_bitrate_estimator/test/bwe_test_framework_unittest.cc', - 'remote_bitrate_estimator/test/bwe_unittest.cc', - 'remote_bitrate_estimator/test/metric_recorder_unittest.cc', - 'remote_bitrate_estimator/test/estimators/nada_unittest.cc', - 'remote_bitrate_estimator/transport_feedback_adapter_unittest.cc', - 'rtp_rtcp/source/mock/mock_rtp_payload_strategy.h', - 'rtp_rtcp/source/byte_io_unittest.cc', - 'rtp_rtcp/source/fec_receiver_unittest.cc', - 'rtp_rtcp/source/fec_test_helper.cc', - 'rtp_rtcp/source/fec_test_helper.h', - 'rtp_rtcp/source/h264_sps_parser_unittest.cc', - 'rtp_rtcp/source/h264_bitstream_parser_unittest.cc', - 'rtp_rtcp/source/nack_rtx_unittest.cc', - 'rtp_rtcp/source/packet_loss_stats_unittest.cc', - 'rtp_rtcp/source/producer_fec_unittest.cc', - 'rtp_rtcp/source/receive_statistics_unittest.cc', - 'rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc', - 'rtp_rtcp/source/rtcp_format_remb_unittest.cc', - 'rtp_rtcp/source/rtcp_packet_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/app_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/report_block_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc', - 'rtp_rtcp/source/rtcp_receiver_unittest.cc', - 'rtp_rtcp/source/rtcp_sender_unittest.cc', - 'rtp_rtcp/source/rtcp_utility_unittest.cc', - 'rtp_rtcp/source/rtp_fec_unittest.cc', - 'rtp_rtcp/source/rtp_format_h264_unittest.cc', - 'rtp_rtcp/source/rtp_format_vp8_test_helper.cc', - 'rtp_rtcp/source/rtp_format_vp8_test_helper.h', - 'rtp_rtcp/source/rtp_format_vp8_unittest.cc', - 'rtp_rtcp/source/rtp_format_vp9_unittest.cc', - 'rtp_rtcp/source/rtp_packet_history_unittest.cc', - 'rtp_rtcp/source/rtp_payload_registry_unittest.cc', - 'rtp_rtcp/source/rtp_rtcp_impl_unittest.cc', - 'rtp_rtcp/source/rtp_header_extension_unittest.cc', - 'rtp_rtcp/source/rtp_sender_unittest.cc', - 'rtp_rtcp/source/vp8_partition_aggregator_unittest.cc', - 'rtp_rtcp/test/testAPI/test_api.cc', - 'rtp_rtcp/test/testAPI/test_api.h', - 'rtp_rtcp/test/testAPI/test_api_audio.cc', - 'rtp_rtcp/test/testAPI/test_api_rtcp.cc', - 'rtp_rtcp/test/testAPI/test_api_video.cc', - 'utility/source/audio_frame_operations_unittest.cc', - 'utility/source/file_player_unittests.cc', - 'utility/source/process_thread_impl_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/codecs/vp8/screenshare_layers_unittest.cc', - 'video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc', - 'video_coding/codecs/vp8/simulcast_unittest.cc', - 'video_coding/codecs/vp8/simulcast_unittest.h', - 'video_coding/codecs/vp9/screenshare_layers_unittest.cc', - 'video_coding/include/mock/mock_vcm_callbacks.h', - 'video_coding/decoding_state_unittest.cc', - 'video_coding/jitter_buffer_unittest.cc', - 'video_coding/jitter_estimator_tests.cc', - 'video_coding/media_optimization_unittest.cc', - 'video_coding/receiver_unittest.cc', - 'video_coding/session_info_unittest.cc', - 'video_coding/timing_unittest.cc', - 'video_coding/video_coding_robustness_unittest.cc', - 'video_coding/video_receiver_unittest.cc', - 'video_coding/video_sender_unittest.cc', - 'video_coding/qm_select_unittest.cc', - 'video_coding/test/stream_generator.cc', - 'video_coding/test/stream_generator.h', - 'video_coding/utility/quality_scaler_unittest.cc', - 'video_processing/test/brightness_detection_test.cc', - 'video_processing/test/content_metrics_test.cc', - 'video_processing/test/deflickering_test.cc', - 'video_processing/test/video_processing_unittest.cc', - 'video_processing/test/video_processing_unittest.h', - ], - 'conditions': [ - ['enable_bwe_test_logging==1', { - 'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1' ], - }, { - 'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ], - 'sources!': [ - 'remote_bitrate_estimator/test/bwe_test_logging.cc' - ], - }], - # Run screen/window capturer tests only on platforms where they are - # supported. - ['desktop_capture_supported==0', { - 'sources!': [ - 'desktop_capture/desktop_and_cursor_composer_unittest.cc', - 'desktop_capture/mouse_cursor_monitor_unittest.cc', - 'desktop_capture/screen_capturer_helper_unittest.cc', - 'desktop_capture/screen_capturer_mac_unittest.cc', - 'desktop_capture/screen_capturer_mock_objects.h', - 'desktop_capture/screen_capturer_unittest.cc', - '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', - ], - 'dependencies': [ - 'audioproc_protobuf_utils', - 'audioproc_unittest_proto', - ], - 'sources': [ - 'audio_processing/audio_processing_impl_locking_unittest.cc', - 'audio_processing/audio_processing_impl_unittest.cc', - 'audio_processing/test/audio_processing_unittest.cc', - 'audio_processing/test/debug_dump_test.cc', - 'audio_processing/test/test_utils.h', - ], - }], - ['build_libvpx==1', { - 'dependencies': [ - '<(libvpx_dir)/libvpx.gyp:libvpx_new', - ], - }], - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - # Need to disable error due to the line in - # base/android/jni_android.h triggering it: - # const BASE_EXPORT jobject GetApplicationContext() - # error: type qualifiers ignored on function return type - 'cflags': [ - '-Wno-ignored-qualifiers', - ], - 'sources': [ - 'audio_device/android/audio_device_unittest.cc', - 'audio_device/android/audio_manager_unittest.cc', - 'audio_device/android/ensure_initialized.cc', - 'audio_device/android/ensure_initialized.h', - ], - }], - ['OS=="ios"', { - 'sources': [ - 'video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc', - 'audio_device/ios/audio_device_unittest_ios.cc', - ], - 'mac_bundle_resources': [ - '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm', - '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm', - '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm', - '<(DEPTH)/resources/audio_device/audio_short16.pcm', - '<(DEPTH)/resources/audio_device/audio_short44.pcm', - '<(DEPTH)/resources/audio_device/audio_short48.pcm', - '<(DEPTH)/resources/audio_processing/agc/agc_no_circular_buffer.dat', - '<(DEPTH)/resources/audio_processing/agc/agc_pitch_gain.dat', - '<(DEPTH)/resources/audio_processing/agc/agc_pitch_lag.dat', - '<(DEPTH)/resources/audio_processing/agc/agc_spectral_peak.dat', - '<(DEPTH)/resources/audio_processing/agc/agc_voicing_prob.dat', - '<(DEPTH)/resources/audio_processing/agc/agc_with_circular_buffer.dat', - '<(DEPTH)/resources/short_mixed_mono_48.dat', - '<(DEPTH)/resources/short_mixed_mono_48.pcm', - '<(DEPTH)/resources/short_mixed_stereo_48.dat', - '<(DEPTH)/resources/short_mixed_stereo_48.pcm', - ], - }], - ], - # Disable warnings to enable Win64 build, issue 1323. - 'msvs_disabled_warnings': [ - 4267, # size_t to int truncation. - ], - }, { 'target_name': 'modules_tests', 'type': '<(gtest_target_type)', @@ -455,6 +103,363 @@ }, ], 'conditions': [ + # Does not compile on iOS for ia32 or x64: webrtc:4755. + ['OS!="ios" or target_arch=="arm" or target_arch=="arm64"', { + 'targets': [ + { + 'target_name': 'modules_unittests', + 'type': '<(gtest_target_type)', + 'defines': [ + '<@(audio_coding_defines)', + ], + 'dependencies': [ + 'acm_receive_test', + 'acm_send_test', + 'audio_coding_module', + 'audio_conference_mixer', + 'audio_device' , + 'audio_processing', + 'audioproc_test_utils', + 'bitrate_controller', + 'bwe_simulator', + 'cng', + 'desktop_capture', + 'isac_fix', + 'media_file', + 'neteq', + 'neteq_test_support', + 'neteq_unittest_tools', + 'paced_sender', + 'pcm16b', # Needed by NetEq tests. + 'red', + 'remote_bitrate_estimator', + 'rtp_rtcp', + 'video_codecs_test_framework', + 'video_processing', + 'webrtc_utility', + 'webrtc_video_coding', + '<@(neteq_dependencies)', + '<(DEPTH)/testing/gmock.gyp:gmock', + '<(DEPTH)/testing/gtest.gyp:gtest', + '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', + '<(webrtc_root)/common.gyp:webrtc_common', + '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', + '<(webrtc_root)/modules/modules.gyp:video_capture', + '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8', + '<(webrtc_root)/modules/video_coding/codecs/vp9/vp9.gyp:webrtc_vp9', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/test/test.gyp:frame_generator', + '<(webrtc_root)/test/test.gyp:rtp_test_utils', + '<(webrtc_root)/test/test.gyp:test_support_main', + '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common', + '<(webrtc_root)/tools/tools.gyp:agc_test_utils', + ], + 'sources': [ + 'audio_coding/codecs/cng/audio_encoder_cng_unittest.cc', + 'audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc', + 'audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc', + 'audio_coding/main/acm2/call_statistics_unittest.cc', + 'audio_coding/main/acm2/codec_manager_unittest.cc', + 'audio_coding/main/acm2/initial_delay_manager_unittest.cc', + 'audio_coding/main/acm2/rent_a_codec_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/audio_encoder_isac_unittest.cc', + 'audio_coding/codecs/isac/main/source/isac_unittest.cc', + 'audio_coding/codecs/isac/unittest.cc', + 'audio_coding/codecs/opus/audio_encoder_opus_unittest.cc', + 'audio_coding/codecs/opus/opus_unittest.cc', + 'audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc', + 'audio_coding/neteq/audio_classifier_unittest.cc', + 'audio_coding/neteq/audio_multi_vector_unittest.cc', + 'audio_coding/neteq/audio_vector_unittest.cc', + 'audio_coding/neteq/background_noise_unittest.cc', + 'audio_coding/neteq/buffer_level_filter_unittest.cc', + 'audio_coding/neteq/comfort_noise_unittest.cc', + 'audio_coding/neteq/decision_logic_unittest.cc', + 'audio_coding/neteq/decoder_database_unittest.cc', + 'audio_coding/neteq/delay_manager_unittest.cc', + 'audio_coding/neteq/delay_peak_detector_unittest.cc', + 'audio_coding/neteq/dsp_helper_unittest.cc', + 'audio_coding/neteq/dtmf_buffer_unittest.cc', + 'audio_coding/neteq/dtmf_tone_generator_unittest.cc', + 'audio_coding/neteq/expand_unittest.cc', + 'audio_coding/neteq/merge_unittest.cc', + 'audio_coding/neteq/nack_unittest.cc', + 'audio_coding/neteq/neteq_external_decoder_unittest.cc', + 'audio_coding/neteq/neteq_impl_unittest.cc', + 'audio_coding/neteq/neteq_network_stats_unittest.cc', + 'audio_coding/neteq/neteq_stereo_unittest.cc', + 'audio_coding/neteq/neteq_unittest.cc', + 'audio_coding/neteq/normal_unittest.cc', + 'audio_coding/neteq/packet_buffer_unittest.cc', + 'audio_coding/neteq/payload_splitter_unittest.cc', + 'audio_coding/neteq/post_decode_vad_unittest.cc', + 'audio_coding/neteq/random_vector_unittest.cc', + 'audio_coding/neteq/sync_buffer_unittest.cc', + 'audio_coding/neteq/timestamp_scaler_unittest.cc', + 'audio_coding/neteq/time_stretch_unittest.cc', + 'audio_coding/neteq/mock/mock_audio_decoder.h', + 'audio_coding/neteq/mock/mock_audio_vector.h', + 'audio_coding/neteq/mock/mock_buffer_level_filter.h', + 'audio_coding/neteq/mock/mock_decoder_database.h', + 'audio_coding/neteq/mock/mock_delay_manager.h', + 'audio_coding/neteq/mock/mock_delay_peak_detector.h', + 'audio_coding/neteq/mock/mock_dtmf_buffer.h', + 'audio_coding/neteq/mock/mock_dtmf_tone_generator.h', + 'audio_coding/neteq/mock/mock_expand.h', + 'audio_coding/neteq/mock/mock_external_decoder_pcm16b.h', + 'audio_coding/neteq/mock/mock_packet_buffer.h', + 'audio_coding/neteq/mock/mock_payload_splitter.h', + 'audio_coding/neteq/tools/input_audio_file_unittest.cc', + 'audio_coding/neteq/tools/packet_unittest.cc', + 'audio_conference_mixer/test/audio_conference_mixer_unittest.cc', + 'audio_device/fine_audio_buffer_unittest.cc', + 'audio_processing/aec/echo_cancellation_unittest.cc', + 'audio_processing/aec/system_delay_unittest.cc', + 'audio_processing/agc/agc_manager_direct_unittest.cc', + # TODO(ajm): Fix to match new interface. + # 'audio_processing/agc/agc_unittest.cc', + 'audio_processing/agc/histogram_unittest.cc', + 'audio_processing/agc/mock_agc.h', + 'audio_processing/beamformer/array_util_unittest.cc', + 'audio_processing/beamformer/complex_matrix_unittest.cc', + 'audio_processing/beamformer/covariance_matrix_generator_unittest.cc', + 'audio_processing/beamformer/matrix_unittest.cc', + 'audio_processing/beamformer/mock_nonlinear_beamformer.h', + 'audio_processing/beamformer/nonlinear_beamformer_unittest.cc', + 'audio_processing/echo_cancellation_impl_unittest.cc', + 'audio_processing/intelligibility/intelligibility_enhancer_unittest.cc', + 'audio_processing/intelligibility/intelligibility_utils_unittest.cc', + 'audio_processing/splitting_filter_unittest.cc', + 'audio_processing/transient/dyadic_decimator_unittest.cc', + 'audio_processing/transient/file_utils.cc', + 'audio_processing/transient/file_utils.h', + 'audio_processing/transient/file_utils_unittest.cc', + 'audio_processing/transient/moving_moments_unittest.cc', + 'audio_processing/transient/transient_detector_unittest.cc', + 'audio_processing/transient/transient_suppressor_unittest.cc', + 'audio_processing/transient/wpd_node_unittest.cc', + 'audio_processing/transient/wpd_tree_unittest.cc', + 'audio_processing/utility/delay_estimator_unittest.cc', + 'audio_processing/vad/gmm_unittest.cc', + 'audio_processing/vad/pitch_based_vad_unittest.cc', + 'audio_processing/vad/pitch_internal_unittest.cc', + 'audio_processing/vad/pole_zero_filter_unittest.cc', + 'audio_processing/vad/standalone_vad_unittest.cc', + 'audio_processing/vad/vad_audio_proc_unittest.cc', + 'audio_processing/vad/vad_circular_buffer_unittest.cc', + 'audio_processing/vad/voice_activity_detector_unittest.cc', + 'bitrate_controller/bitrate_controller_unittest.cc', + 'bitrate_controller/send_side_bandwidth_estimation_unittest.cc', + 'desktop_capture/desktop_and_cursor_composer_unittest.cc', + 'desktop_capture/desktop_region_unittest.cc', + 'desktop_capture/differ_block_unittest.cc', + 'desktop_capture/differ_unittest.cc', + 'desktop_capture/mouse_cursor_monitor_unittest.cc', + 'desktop_capture/screen_capturer_helper_unittest.cc', + 'desktop_capture/screen_capturer_mac_unittest.cc', + 'desktop_capture/screen_capturer_mock_objects.h', + 'desktop_capture/screen_capturer_unittest.cc', + 'desktop_capture/window_capturer_unittest.cc', + 'desktop_capture/win/cursor_unittest.cc', + 'desktop_capture/win/cursor_unittest_resources.h', + 'desktop_capture/win/cursor_unittest_resources.rc', + 'media_file/media_file_unittest.cc', + 'module_common_types_unittest.cc', + 'pacing/bitrate_prober_unittest.cc', + 'pacing/paced_sender_unittest.cc', + 'pacing/packet_router_unittest.cc', + 'remote_bitrate_estimator/bwe_simulations.cc', + 'remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h', + 'remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h', + 'remote_bitrate_estimator/inter_arrival_unittest.cc', + 'remote_bitrate_estimator/overuse_detector_unittest.cc', + 'remote_bitrate_estimator/rate_statistics_unittest.cc', + 'remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc', + 'remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc', + 'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc', + 'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h', + 'remote_bitrate_estimator/remote_estimator_proxy_unittest.cc', + 'remote_bitrate_estimator/send_time_history_unittest.cc', + 'remote_bitrate_estimator/test/bwe_test_framework_unittest.cc', + 'remote_bitrate_estimator/test/bwe_unittest.cc', + 'remote_bitrate_estimator/test/metric_recorder_unittest.cc', + 'remote_bitrate_estimator/test/estimators/nada_unittest.cc', + 'remote_bitrate_estimator/transport_feedback_adapter_unittest.cc', + 'rtp_rtcp/source/mock/mock_rtp_payload_strategy.h', + 'rtp_rtcp/source/byte_io_unittest.cc', + 'rtp_rtcp/source/fec_receiver_unittest.cc', + 'rtp_rtcp/source/fec_test_helper.cc', + 'rtp_rtcp/source/fec_test_helper.h', + 'rtp_rtcp/source/h264_sps_parser_unittest.cc', + 'rtp_rtcp/source/h264_bitstream_parser_unittest.cc', + 'rtp_rtcp/source/nack_rtx_unittest.cc', + 'rtp_rtcp/source/packet_loss_stats_unittest.cc', + 'rtp_rtcp/source/producer_fec_unittest.cc', + 'rtp_rtcp/source/receive_statistics_unittest.cc', + 'rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc', + 'rtp_rtcp/source/rtcp_format_remb_unittest.cc', + 'rtp_rtcp/source/rtcp_packet_unittest.cc', + 'rtp_rtcp/source/rtcp_packet/app_unittest.cc', + 'rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc', + 'rtp_rtcp/source/rtcp_packet/report_block_unittest.cc', + 'rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc', + 'rtp_rtcp/source/rtcp_receiver_unittest.cc', + 'rtp_rtcp/source/rtcp_sender_unittest.cc', + 'rtp_rtcp/source/rtcp_utility_unittest.cc', + 'rtp_rtcp/source/rtp_fec_unittest.cc', + 'rtp_rtcp/source/rtp_format_h264_unittest.cc', + 'rtp_rtcp/source/rtp_format_vp8_test_helper.cc', + 'rtp_rtcp/source/rtp_format_vp8_test_helper.h', + 'rtp_rtcp/source/rtp_format_vp8_unittest.cc', + 'rtp_rtcp/source/rtp_format_vp9_unittest.cc', + 'rtp_rtcp/source/rtp_packet_history_unittest.cc', + 'rtp_rtcp/source/rtp_payload_registry_unittest.cc', + 'rtp_rtcp/source/rtp_rtcp_impl_unittest.cc', + 'rtp_rtcp/source/rtp_header_extension_unittest.cc', + 'rtp_rtcp/source/rtp_sender_unittest.cc', + 'rtp_rtcp/source/vp8_partition_aggregator_unittest.cc', + 'rtp_rtcp/test/testAPI/test_api.cc', + 'rtp_rtcp/test/testAPI/test_api.h', + 'rtp_rtcp/test/testAPI/test_api_audio.cc', + 'rtp_rtcp/test/testAPI/test_api_rtcp.cc', + 'rtp_rtcp/test/testAPI/test_api_video.cc', + 'utility/source/audio_frame_operations_unittest.cc', + 'utility/source/file_player_unittests.cc', + 'utility/source/process_thread_impl_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/codecs/vp8/screenshare_layers_unittest.cc', + 'video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc', + 'video_coding/codecs/vp8/simulcast_unittest.cc', + 'video_coding/codecs/vp8/simulcast_unittest.h', + 'video_coding/codecs/vp9/screenshare_layers_unittest.cc', + 'video_coding/include/mock/mock_vcm_callbacks.h', + 'video_coding/decoding_state_unittest.cc', + 'video_coding/jitter_buffer_unittest.cc', + 'video_coding/jitter_estimator_tests.cc', + 'video_coding/media_optimization_unittest.cc', + 'video_coding/receiver_unittest.cc', + 'video_coding/session_info_unittest.cc', + 'video_coding/timing_unittest.cc', + 'video_coding/video_coding_robustness_unittest.cc', + 'video_coding/video_receiver_unittest.cc', + 'video_coding/video_sender_unittest.cc', + 'video_coding/qm_select_unittest.cc', + 'video_coding/test/stream_generator.cc', + 'video_coding/test/stream_generator.h', + 'video_coding/utility/quality_scaler_unittest.cc', + 'video_processing/test/brightness_detection_test.cc', + 'video_processing/test/content_metrics_test.cc', + 'video_processing/test/deflickering_test.cc', + 'video_processing/test/video_processing_unittest.cc', + 'video_processing/test/video_processing_unittest.h', + ], + 'conditions': [ + ['enable_bwe_test_logging==1', { + 'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1' ], + }, { + 'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ], + 'sources!': [ + 'remote_bitrate_estimator/test/bwe_test_logging.cc' + ], + }], + # Run screen/window capturer tests only on platforms where they are + # supported. + ['desktop_capture_supported==0', { + 'sources!': [ + 'desktop_capture/desktop_and_cursor_composer_unittest.cc', + 'desktop_capture/mouse_cursor_monitor_unittest.cc', + 'desktop_capture/screen_capturer_helper_unittest.cc', + 'desktop_capture/screen_capturer_mac_unittest.cc', + 'desktop_capture/screen_capturer_mock_objects.h', + 'desktop_capture/screen_capturer_unittest.cc', + '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', + ], + 'dependencies': [ + 'audioproc_protobuf_utils', + 'audioproc_unittest_proto', + ], + 'sources': [ + 'audio_processing/audio_processing_impl_locking_unittest.cc', + 'audio_processing/audio_processing_impl_unittest.cc', + 'audio_processing/test/audio_processing_unittest.cc', + 'audio_processing/test/debug_dump_test.cc', + 'audio_processing/test/test_utils.h', + ], + }], + ['build_libvpx==1', { + 'dependencies': [ + '<(libvpx_dir)/libvpx.gyp:libvpx_new', + ], + }], + ['OS=="android"', { + 'dependencies': [ + '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', + ], + # Need to disable error due to the line in + # base/android/jni_android.h triggering it: + # const BASE_EXPORT jobject GetApplicationContext() + # error: type qualifiers ignored on function return type + 'cflags': [ + '-Wno-ignored-qualifiers', + ], + 'sources': [ + 'audio_device/android/audio_device_unittest.cc', + 'audio_device/android/audio_manager_unittest.cc', + 'audio_device/android/ensure_initialized.cc', + 'audio_device/android/ensure_initialized.h', + ], + }], + ['OS=="ios"', { + 'sources': [ + 'video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc', + 'audio_device/ios/audio_device_unittest_ios.cc', + ], + 'mac_bundle_resources': [ + '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm', + '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm', + '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm', + '<(DEPTH)/resources/audio_device/audio_short16.pcm', + '<(DEPTH)/resources/audio_device/audio_short44.pcm', + '<(DEPTH)/resources/audio_device/audio_short48.pcm', + '<(DEPTH)/resources/audio_processing/agc/agc_no_circular_buffer.dat', + '<(DEPTH)/resources/audio_processing/agc/agc_pitch_gain.dat', + '<(DEPTH)/resources/audio_processing/agc/agc_pitch_lag.dat', + '<(DEPTH)/resources/audio_processing/agc/agc_spectral_peak.dat', + '<(DEPTH)/resources/audio_processing/agc/agc_voicing_prob.dat', + '<(DEPTH)/resources/audio_processing/agc/agc_with_circular_buffer.dat', + '<(DEPTH)/resources/short_mixed_mono_48.dat', + '<(DEPTH)/resources/short_mixed_mono_48.pcm', + '<(DEPTH)/resources/short_mixed_stereo_48.dat', + '<(DEPTH)/resources/short_mixed_stereo_48.pcm', + ], + }], + ], + # Disable warnings to enable Win64 build, issue 1323. + 'msvs_disabled_warnings': [ + 4267, # size_t to int truncation. + ], + }, + ], + }], ['OS=="android"', { 'targets': [ { diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi index 9f2d86c54a..5ec32b70b9 100644 --- a/webrtc/modules/video_render/video_render.gypi +++ b/webrtc/modules/video_render/video_render.gypi @@ -153,9 +153,10 @@ }, ], }], # build_with_chromium==0 - ['include_tests==1', { + ['include_tests==1 and OS!="ios"', { 'targets': [ { + # Does not compile on iOS: webrtc:4755. 'target_name': 'video_render_tests', 'type': 'executable', 'dependencies': [ @@ -197,7 +198,7 @@ ] # conditions }, # video_render_module_test ], # targets - }], # include_tests==1 + }], # include_tests==1 and OS!=ios ], # conditions } diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp index 265ad01992..570d68062d 100644 --- a/webrtc/voice_engine/voice_engine.gyp +++ b/webrtc/voice_engine/voice_engine.gyp @@ -145,85 +145,6 @@ }], ], }, - { - 'target_name': 'voe_auto_test', - 'type': 'executable', - 'dependencies': [ - 'voice_engine', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', - '<(webrtc_root)/test/test.gyp:channel_transport', - '<(webrtc_root)/test/test.gyp:test_support', - '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common', - '<(webrtc_root)/webrtc.gyp:rtc_event_log', - ], - 'sources': [ - 'test/auto_test/automated_mode.cc', - 'test/auto_test/extended/agc_config_test.cc', - 'test/auto_test/extended/ec_metrics_test.cc', - 'test/auto_test/fakes/conference_transport.cc', - 'test/auto_test/fakes/conference_transport.h', - 'test/auto_test/fakes/loudest_filter.cc', - 'test/auto_test/fakes/loudest_filter.h', - 'test/auto_test/fixtures/after_initialization_fixture.cc', - 'test/auto_test/fixtures/after_initialization_fixture.h', - 'test/auto_test/fixtures/after_streaming_fixture.cc', - 'test/auto_test/fixtures/after_streaming_fixture.h', - 'test/auto_test/fixtures/before_initialization_fixture.cc', - 'test/auto_test/fixtures/before_initialization_fixture.h', - 'test/auto_test/fixtures/before_streaming_fixture.cc', - 'test/auto_test/fixtures/before_streaming_fixture.h', - 'test/auto_test/standard/audio_processing_test.cc', - 'test/auto_test/standard/codec_before_streaming_test.cc', - 'test/auto_test/standard/codec_test.cc', - 'test/auto_test/standard/dtmf_test.cc', - 'test/auto_test/standard/external_media_test.cc', - 'test/auto_test/standard/file_before_streaming_test.cc', - 'test/auto_test/standard/file_test.cc', - 'test/auto_test/standard/hardware_before_initializing_test.cc', - 'test/auto_test/standard/hardware_before_streaming_test.cc', - 'test/auto_test/standard/hardware_test.cc', - 'test/auto_test/standard/mixing_test.cc', - 'test/auto_test/standard/neteq_stats_test.cc', - 'test/auto_test/standard/rtp_rtcp_before_streaming_test.cc', - 'test/auto_test/standard/rtp_rtcp_extensions.cc', - 'test/auto_test/standard/rtp_rtcp_test.cc', - 'test/auto_test/standard/voe_base_misc_test.cc', - 'test/auto_test/standard/video_sync_test.cc', - 'test/auto_test/standard/volume_test.cc', - 'test/auto_test/resource_manager.cc', - 'test/auto_test/voe_conference_test.cc', - 'test/auto_test/voe_cpu_test.cc', - 'test/auto_test/voe_cpu_test.h', - 'test/auto_test/voe_output_test.cc', - 'test/auto_test/voe_standard_test.cc', - 'test/auto_test/voe_standard_test.h', - 'test/auto_test/voe_stress_test.cc', - 'test/auto_test/voe_stress_test.h', - 'test/auto_test/voe_test_defines.h', - 'test/auto_test/voe_test_interface.h', - ], - 'conditions': [ - ['OS=="android"', { - # some tests are not supported on android yet, exclude these tests. - 'sources!': [ - 'test/auto_test/standard/hardware_before_streaming_test.cc', - ], - }], - ['enable_protobuf==1', { - 'defines': [ - 'ENABLE_RTC_EVENT_LOG', - ], - }], - ], - # Disable warnings to enable Win64 build, issue 1323. - 'msvs_disabled_warnings': [ - 4267, # size_t to int truncation. - ], - }, { # command line test that should work on linux/mac/win 'target_name': 'voe_cmd_test', @@ -244,6 +165,89 @@ }, ], # targets 'conditions': [ + ['OS!="ios"', { + 'targets': [ + { + 'target_name': 'voe_auto_test', + 'type': 'executable', + 'dependencies': [ + 'voice_engine', + '<(DEPTH)/testing/gmock.gyp:gmock', + '<(DEPTH)/testing/gtest.gyp:gtest', + '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/test/test.gyp:channel_transport', + '<(webrtc_root)/test/test.gyp:test_support', + '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common', + '<(webrtc_root)/webrtc.gyp:rtc_event_log', + ], + 'sources': [ + 'test/auto_test/automated_mode.cc', + 'test/auto_test/extended/agc_config_test.cc', + 'test/auto_test/extended/ec_metrics_test.cc', + 'test/auto_test/fakes/conference_transport.cc', + 'test/auto_test/fakes/conference_transport.h', + 'test/auto_test/fakes/loudest_filter.cc', + 'test/auto_test/fakes/loudest_filter.h', + 'test/auto_test/fixtures/after_initialization_fixture.cc', + 'test/auto_test/fixtures/after_initialization_fixture.h', + 'test/auto_test/fixtures/after_streaming_fixture.cc', + 'test/auto_test/fixtures/after_streaming_fixture.h', + 'test/auto_test/fixtures/before_initialization_fixture.cc', + 'test/auto_test/fixtures/before_initialization_fixture.h', + 'test/auto_test/fixtures/before_streaming_fixture.cc', + 'test/auto_test/fixtures/before_streaming_fixture.h', + 'test/auto_test/standard/audio_processing_test.cc', + 'test/auto_test/standard/codec_before_streaming_test.cc', + 'test/auto_test/standard/codec_test.cc', + 'test/auto_test/standard/dtmf_test.cc', + 'test/auto_test/standard/external_media_test.cc', + 'test/auto_test/standard/file_before_streaming_test.cc', + 'test/auto_test/standard/file_test.cc', + 'test/auto_test/standard/hardware_before_initializing_test.cc', + 'test/auto_test/standard/hardware_before_streaming_test.cc', + 'test/auto_test/standard/hardware_test.cc', + 'test/auto_test/standard/mixing_test.cc', + 'test/auto_test/standard/neteq_stats_test.cc', + 'test/auto_test/standard/rtp_rtcp_before_streaming_test.cc', + 'test/auto_test/standard/rtp_rtcp_extensions.cc', + 'test/auto_test/standard/rtp_rtcp_test.cc', + 'test/auto_test/standard/voe_base_misc_test.cc', + 'test/auto_test/standard/video_sync_test.cc', + 'test/auto_test/standard/volume_test.cc', + 'test/auto_test/resource_manager.cc', + 'test/auto_test/voe_conference_test.cc', + 'test/auto_test/voe_cpu_test.cc', + 'test/auto_test/voe_cpu_test.h', + 'test/auto_test/voe_output_test.cc', + 'test/auto_test/voe_standard_test.cc', + 'test/auto_test/voe_standard_test.h', + 'test/auto_test/voe_stress_test.cc', + 'test/auto_test/voe_stress_test.h', + 'test/auto_test/voe_test_defines.h', + 'test/auto_test/voe_test_interface.h', + ], + 'conditions': [ + ['OS=="android"', { + # some tests are not supported on android yet, exclude these tests. + 'sources!': [ + 'test/auto_test/standard/hardware_before_streaming_test.cc', + ], + }], + ['enable_protobuf==1', { + 'defines': [ + 'ENABLE_RTC_EVENT_LOG', + ], + }], + ], + # Disable warnings to enable Win64 build, issue 1323. + 'msvs_disabled_warnings': [ + 4267, # size_t to int truncation. + ], + }, + ], + }], ['OS=="android"', { 'targets': [ { @@ -286,6 +290,6 @@ ], }], ], # conditions - }], # include_tests + }], # include_tests==1 ], # conditions }