diff --git a/all.gyp b/all.gyp index be267fbff5..0d0926517d 100644 --- a/all.gyp +++ b/all.gyp @@ -47,9 +47,6 @@ 'webrtc/webrtc_tests.gypi', ], 'dependencies': [ - 'webrtc/api/api_tests.gyp:*', - 'webrtc/common_video/common_video_unittests.gyp:*', - 'webrtc/system_wrappers/system_wrappers_tests.gyp:*', 'webrtc/test/test.gyp:*', ], }], diff --git a/webrtc/api/api_tests.gyp b/webrtc/api/api_tests.gyp deleted file mode 100644 index 51fb63df41..0000000000 --- a/webrtc/api/api_tests.gyp +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright (c) 2015 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': [ '../build/common.gypi', ], - 'targets': [ - { - 'target_name': 'peerconnection_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(webrtc_root)/api/api.gyp:libjingle_peerconnection', - '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', - '<(webrtc_root)/common.gyp:webrtc_common', - '<(webrtc_root)/media/media.gyp:rtc_unittest_main', - '<(webrtc_root)/pc/pc.gyp:rtc_pc', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', - ], - 'defines': [ - # Feature selection. - 'HAVE_SCTP', - ], - 'sources': [ - 'datachannel_unittest.cc', - 'dtmfsender_unittest.cc', - 'fakemetricsobserver.cc', - 'fakemetricsobserver.h', - 'jsepsessiondescription_unittest.cc', - 'localaudiosource_unittest.cc', - 'mediaconstraintsinterface_unittest.cc', - 'mediastream_unittest.cc', - 'peerconnection_unittest.cc', - 'peerconnectionendtoend_unittest.cc', - 'peerconnectionfactory_unittest.cc', - 'peerconnectioninterface_unittest.cc', - 'proxy_unittest.cc', - 'rtpsenderreceiver_unittest.cc', - 'statscollector_unittest.cc', - 'test/fakeaudiocapturemodule.cc', - 'test/fakeaudiocapturemodule.h', - 'test/fakeaudiocapturemodule_unittest.cc', - 'test/fakeconstraints.h', - 'test/fakedatachannelprovider.h', - 'test/fakeperiodicvideocapturer.h', - 'test/fakertccertificategenerator.h', - 'test/fakevideotrackrenderer.h', - 'test/mock_datachannel.h', - 'test/mock_peerconnection.h', - 'test/mock_webrtcsession.h', - 'test/mockpeerconnectionobservers.h', - 'test/peerconnectiontestwrapper.h', - 'test/peerconnectiontestwrapper.cc', - 'test/testsdpstrings.h', - 'videocapturertracksource_unittest.cc', - 'videotrack_unittest.cc', - 'webrtcsdp_unittest.cc', - 'webrtcsession_unittest.cc', - ], - # TODO(kjellander): Make the code compile without disabling these flags. - # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 - 'cflags': [ - '-Wno-sign-compare', - ], - 'cflags!': [ - '-Wextra', - ], - 'cflags_cc!': [ - '-Woverloaded-virtual', - ], - 'msvs_disabled_warnings': [ - 4245, # conversion from 'int' to 'size_t', signed/unsigned mismatch. - 4267, # conversion from 'size_t' to 'int', possible loss of data. - 4389, # signed/unsigned mismatch. - ], - 'conditions': [ - ['clang==1', { - # TODO(kjellander): Make the code compile without disabling these flags. - # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 - 'cflags!': [ - '-Wextra', - ], - 'xcode_settings': { - 'WARNING_CFLAGS!': ['-Wextra'], - }, - }], - ['OS=="android"', { - 'sources': [ - 'test/androidtestinitializer.cc', - 'test/androidtestinitializer.h', - ], - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - '<(webrtc_root)/api/api.gyp:libjingle_peerconnection_jni', - ], - }], - ['OS=="win" and clang==1', { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'AdditionalOptions': [ - # Disable warnings failing when compiling with Clang on Windows. - # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 - '-Wno-sign-compare', - '-Wno-unused-function', - ], - }, - }, - }], - ['use_quic==1', { - 'dependencies': [ - '<(DEPTH)/third_party/libquic/libquic.gyp:libquic', - ], - 'sources': [ - 'quicdatachannel_unittest.cc', - 'quicdatatransport_unittest.cc', - ], - 'export_dependent_settings': [ - '<(DEPTH)/third_party/libquic/libquic.gyp:libquic', - ], - }], - ], # conditions - }, # target peerconnection_unittests - ], # targets - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'libjingle_peerconnection_android_unittest', - 'type': 'none', - 'dependencies': [ - '<(webrtc_root)/api/api_java.gyp:libjingle_peerconnection_java', - ], - 'variables': { - 'apk_name': 'libjingle_peerconnection_android_unittest', - 'java_in_dir': 'androidtests', - 'resource_dir': 'androidtests/res', - 'native_lib_target': 'libjingle_peerconnection_so', - 'is_test_apk': 1, - 'test_type': 'instrumentation', - 'tested_apk_path': '', - 'never_lint': 1, - }, - 'includes': [ - '../../build/java_apk.gypi', - '../../build/android/test_runner.gypi', - ], - }, - ], # targets - }], # OS=="android" - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'peerconnection_unittests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):peerconnection_unittests_apk', - ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', - { - 'targets': [ - { - 'target_name': 'peerconnection_unittests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):peerconnection_unittests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'peerconnection_unittests_apk.isolate', - ], - }, - ] - } - ], - ], - }], # OS=="android" - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'peerconnection_unittests_run', - 'type': 'none', - 'dependencies': [ - 'peerconnection_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'peerconnection_unittests.isolate', - ], - }, - ], # targets - }], # test_isolation_mode != "noop" - ], # conditions -} diff --git a/webrtc/api/peerconnection_unittests.isolate b/webrtc/api/peerconnection_unittests.isolate deleted file mode 100644 index ad03ccf5f2..0000000000 --- a/webrtc/api/peerconnection_unittests.isolate +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/peerconnection_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(PRODUCT_DIR)/peerconnection_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/api/peerconnection_unittests_apk.isolate b/webrtc/api/peerconnection_unittests_apk.isolate deleted file mode 100644 index 3b895e88e4..0000000000 --- a/webrtc/api/peerconnection_unittests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../../build/android/android.isolate', - 'peerconnection_unittests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_peerconnection_unittests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../build/config/', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/peerconnection_unittests_apk/', - '<(PRODUCT_DIR)/bin/run_peerconnection_unittests', - 'peerconnection_unittests.isolate', - ] - } -} diff --git a/webrtc/build/android_tests.gyp b/webrtc/build/android_tests.gyp index 7803b9a419..ab609f70c6 100644 --- a/webrtc/build/android_tests.gyp +++ b/webrtc/build/android_tests.gyp @@ -18,248 +18,6 @@ 'common.gypi', ], 'targets': [ - { - 'target_name': 'audio_codec_speed_tests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'audio_codec_speed_tests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)audio_codec_speed_tests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../modules/audio_codec_speed_tests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/modules/modules.gyp:audio_codec_speed_tests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'audio_decoder_unittests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'audio_decoder_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)audio_decoder_unittests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../modules/audio_decoder_unittests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/modules/modules.gyp:audio_decoder_unittests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'common_audio_unittests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'common_audio_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)common_audio_unittests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../common_audio/common_audio_unittests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/common_audio/common_audio.gyp:common_audio_unittests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'common_video_unittests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'common_video_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)common_video_unittests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../common_video/common_video_unittests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/common_video/common_video_unittests.gyp:common_video_unittests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'modules_tests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'modules_tests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)modules_tests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../modules/modules_tests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/modules/modules.gyp:modules_tests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'modules_unittests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'modules_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)modules_unittests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../modules/modules_unittests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/modules/modules.gyp:modules_unittests', - 'audio_device_java', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'peerconnection_unittests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'peerconnection_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)peerconnection_unittests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../api/peerconnection_unittests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/api/api_tests.gyp:peerconnection_unittests', - '<(webrtc_root)/api/api_java.gyp:libjingle_peerconnection_java', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'rtc_unittests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'rtc_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)rtc_unittests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../rtc_unittests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/webrtc.gyp:rtc_unittests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'system_wrappers_unittests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'system_wrappers_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)system_wrappers_unittests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../system_wrappers/system_wrappers_unittests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/system_wrappers/system_wrappers_tests.gyp:system_wrappers_unittests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'test_support_unittests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'test_support_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)test_support_unittests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../test/test_support_unittests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/test/test.gyp:test_support_unittests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'tools_unittests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'tools_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)tools_unittests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../tools/tools_unittests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/tools/tools.gyp:tools_unittests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'video_engine_tests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'video_engine_tests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)video_engine_tests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../video_engine_tests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/webrtc.gyp:video_engine_tests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'voice_engine_unittests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'voice_engine_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)voice_engine_unittests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../voice_engine/voice_engine_unittests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_unittests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'webrtc_perf_tests_apk', - 'type': 'none', - 'variables': { - 'test_suite_name': 'webrtc_perf_tests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webrtc_perf_tests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../webrtc_perf_tests.isolate', - 'shard_timeout': 2700, - }, - 'dependencies': [ - '<(webrtc_root)/webrtc.gyp:webrtc_perf_tests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, - { - 'target_name': 'webrtc_nonparallel_tests_apk', - 'type': 'none', - 'variables': { - 'shard_timeout': 900, - 'test_suite_name': 'webrtc_nonparallel_tests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webrtc_nonparallel_tests<(SHARED_LIB_SUFFIX)', - 'isolate_file': '../webrtc_nonparallel_tests.isolate', - }, - 'dependencies': [ - '<(webrtc_root)/webrtc.gyp:webrtc_nonparallel_tests', - ], - 'includes': [ - '../../build/apk_test.gypi', - ], - }, { 'target_name': 'android_junit_tests', 'type': 'none', @@ -282,17 +40,5 @@ '../../build/host_jar.gypi', ], }, - { - 'target_name': 'audio_device_java', - 'type': 'none', - 'variables': { - 'java_in_dir': '<(webrtc_root)/modules/audio_device/android/java', - 'additional_src_dirs': [ '<(webrtc_root)/base/java/src', ], - 'never_lint': 1, - }, - 'includes': [ - '../../build/java.gypi', - ], - }, ], } diff --git a/webrtc/build/android_tests_noop.gyp b/webrtc/build/android_tests_noop.gyp index fd6835b9af..d3c981cd2a 100644 --- a/webrtc/build/android_tests_noop.gyp +++ b/webrtc/build/android_tests_noop.gyp @@ -9,66 +9,6 @@ # See webrtc/build/android_tests.gyp for more information about this file. { 'targets': [ - { - 'target_name': 'audio_decoder_unittests_apk', - 'type': 'none', - }, - { - 'target_name': 'common_audio_unittests_apk', - 'type': 'none', - }, - { - 'target_name': 'common_video_unittests_apk', - 'type': 'none', - }, - { - 'target_name': 'peerconnection_unittests_apk', - 'type': 'none', - }, - { - 'target_name': 'modules_tests_apk', - 'type': 'none', - }, - { - 'target_name': 'modules_unittests_apk', - 'type': 'none', - }, - { - 'target_name': 'rtc_unittests_apk', - 'type': 'none', - }, - { - 'target_name': 'system_wrappers_unittests_apk', - 'type': 'none', - }, - { - 'target_name': 'test_support_unittests_apk', - 'type': 'none', - }, - { - 'target_name': 'tools_unittests_apk', - 'type': 'none', - }, - { - 'target_name': 'video_engine_tests_apk', - 'type': 'none', - }, - { - 'target_name': 'voice_engine_unittests_apk', - 'type': 'none', - }, - { - 'target_name': 'webrtc_nonparallel_tests_apk', - 'type': 'none', - }, - { - 'target_name': 'webrtc_perf_tests_apk', - 'type': 'none', - }, - { - 'target_name': 'audio_codec_speed_tests_apk', - 'type': 'none', - }, { 'target_name': 'android_junit_tests', 'type': 'none', diff --git a/webrtc/common_audio/common_audio.gyp b/webrtc/common_audio/common_audio.gyp index 41f6111290..735c2b3107 100644 --- a/webrtc/common_audio/common_audio.gyp +++ b/webrtc/common_audio/common_audio.gyp @@ -228,114 +228,5 @@ }, ], # targets }], - ['include_tests==1', { - 'targets' : [ - { - 'target_name': 'common_audio_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'common_audio', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'audio_converter_unittest.cc', - 'audio_ring_buffer_unittest.cc', - 'audio_util_unittest.cc', - 'blocker_unittest.cc', - 'channel_buffer_unittest.cc', - 'fir_filter_unittest.cc', - 'lapped_transform_unittest.cc', - 'real_fourier_unittest.cc', - 'resampler/resampler_unittest.cc', - 'resampler/push_resampler_unittest.cc', - 'resampler/push_sinc_resampler_unittest.cc', - 'resampler/sinusoidal_linear_chirp_source.cc', - 'resampler/sinusoidal_linear_chirp_source.h', - 'ring_buffer_unittest.cc', - 'signal_processing/real_fft_unittest.cc', - 'signal_processing/signal_processing_unittest.cc', - 'sparse_fir_filter_unittest.cc', - 'vad/vad_core_unittest.cc', - 'vad/vad_filterbank_unittest.cc', - 'vad/vad_gmm_unittest.cc', - 'vad/vad_sp_unittest.cc', - 'vad/vad_unittest.cc', - 'vad/vad_unittest.h', - 'wav_header_unittest.cc', - 'wav_file_unittest.cc', - 'window_generator_unittest.cc', - ], - 'conditions': [ - ['rtc_use_openmax_dl==1', { - 'defines': ['RTC_USE_OPENMAX_DL',], - }], - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - # Does not compile on iOS for arm: webrtc:5544. - ['OS!="ios" or target_arch!="arm"' , { - 'sources': [ - 'resampler/sinc_resampler_unittest.cc', - ], - }], - ], - }, - ], # targets - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'common_audio_unittests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):common_audio_unittests_apk', - ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', - { - 'targets': [ - { - 'target_name': 'common_audio_unittests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):common_audio_unittests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'common_audio_unittests_apk.isolate', - ], - }, - ], - }, - ], - ], - }], # OS=="android" - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'common_audio_unittests_run', - 'type': 'none', - 'dependencies': [ - 'common_audio_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'common_audio_unittests.isolate', - ], - }, - ], - }], - ], - }], ], # conditions } diff --git a/webrtc/common_audio/common_audio_unittests.isolate b/webrtc/common_audio/common_audio_unittests.isolate deleted file mode 100644 index 3bc26d5272..0000000000 --- a/webrtc/common_audio/common_audio_unittests.isolate +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/common_audio/common_audio_unittests_apk.isolate b/webrtc/common_audio/common_audio_unittests_apk.isolate deleted file mode 100644 index d426732fe9..0000000000 --- a/webrtc/common_audio/common_audio_unittests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../../build/android/android.isolate', - 'common_audio_unittests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_common_audio_unittests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../build/config/', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/common_audio_unittests_apk/', - '<(PRODUCT_DIR)/bin/run_common_audio_unittests', - 'common_audio_unittests.isolate', - ] - } -} diff --git a/webrtc/common_video/common_video_unittests.gyp b/webrtc/common_video/common_video_unittests.gyp deleted file mode 100644 index fb7a7431a0..0000000000 --- a/webrtc/common_video/common_video_unittests.gyp +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright (c) 2013 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': ['../build/common.gypi'], - 'targets': [ - { - 'target_name': 'common_video_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '<(webrtc_root)/common_video/common_video.gyp:common_video', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(webrtc_root)/test/test.gyp:video_test_common', - ], - 'sources': [ - 'bitrate_adjuster_unittest.cc', - 'h264/pps_parser_unittest.cc', - 'h264/sps_parser_unittest.cc', - 'h264/sps_vui_rewriter_unittest.cc', - 'i420_buffer_pool_unittest.cc', - 'i420_video_frame_unittest.cc', - 'libyuv/libyuv_unittest.cc', - ], - # Disable warnings to enable Win64 build, issue 1323. - 'msvs_disabled_warnings': [ - 4267, # size_t to int truncation. - ], - 'conditions': [ - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - ['OS=="ios"', { - 'mac_bundle_resources': [ - '<(DEPTH)/resources/foreman_cif.yuv', - ], - }], - ], - }, - ], # targets - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'common_video_unittests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):common_video_unittests_apk', - ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', - { - 'targets': [ - { - 'target_name': 'common_video_unittests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):common_video_unittests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'common_video_unittests_apk.isolate', - ], - }, - ], - }, - ], - ], - }], # OS=="android" - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'common_video_unittests_run', - 'type': 'none', - 'dependencies': [ - 'common_video_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'common_video_unittests.isolate', - ], - }, - ], - }], - ], -} diff --git a/webrtc/common_video/common_video_unittests.isolate b/webrtc/common_video/common_video_unittests.isolate deleted file mode 100644 index 7201883500..0000000000 --- a/webrtc/common_video/common_video_unittests.isolate +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', { - 'variables': { - 'files': [ - '<(DEPTH)/resources/foreman_cif.yuv', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/DEPS', - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/common_video_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/common_video/common_video_unittests_apk.isolate b/webrtc/common_video/common_video_unittests_apk.isolate deleted file mode 100644 index 36514cdb61..0000000000 --- a/webrtc/common_video/common_video_unittests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../../build/android/android.isolate', - 'common_video_unittests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_common_video_unittests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../build/config/', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/common_video_unittests_apk/', - '<(PRODUCT_DIR)/bin/run_common_video_unittests', - 'common_video_unittests.isolate', - ] - } -} diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp index 5efdec178a..9a9fbbb831 100644 --- a/webrtc/media/media.gyp +++ b/webrtc/media/media.gyp @@ -176,183 +176,4 @@ ], }, # target rtc_media ], # targets. - 'conditions': [ - ['include_tests==1', { - 'targets' : [ - { - 'target_name': 'rtc_unittest_main', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/api/api.gyp:call_api', - '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', - '<(webrtc_root)/media/media.gyp:rtc_media', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(libyuv_dir)/include', - '<(DEPTH)/testing/gmock/include', - ], - }, - 'conditions': [ - ['build_libyuv==1', { - 'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',], - }], - ['OS=="ios"', { - # TODO(kjellander): Make the code compile without disabling these. - # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 - 'cflags': [ - '-Wno-unused-variable', - ], - 'xcode_settings': { - 'WARNING_CFLAGS': [ - '-Wno-unused-variable', - ], - }, - }], - ], - 'include_dirs': [ - '<(DEPTH)/testing/gtest/include', - '<(DEPTH)/testing/gtest', - ], - 'sources': [ - 'base/fakemediaengine.h', - 'base/fakenetworkinterface.h', - 'base/fakertp.h', - 'base/fakevideocapturer.h', - 'base/fakevideorenderer.h', - 'base/test/mock_mediachannel.h', - 'base/testutils.cc', - 'base/testutils.h', - 'engine/fakewebrtccall.cc', - 'engine/fakewebrtccall.h', - 'engine/fakewebrtcdeviceinfo.h', - 'engine/fakewebrtcvcmfactory.h', - 'engine/fakewebrtcvideocapturemodule.h', - 'engine/fakewebrtcvideoengine.h', - 'engine/fakewebrtcvoiceengine.h', - ], - }, # target rtc_unittest_main - { - 'target_name': 'rtc_media_unittests', - 'type': 'executable', - 'dependencies': [ - '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', - '<(webrtc_root)/test/test.gyp:test_support', - 'rtc_media', - 'rtc_unittest_main', - ], - 'sources': [ - 'base/codec_unittest.cc', - 'base/rtpdataengine_unittest.cc', - 'base/rtpdump_unittest.cc', - 'base/rtputils_unittest.cc', - 'base/streamparams_unittest.cc', - 'base/turnutils_unittest.cc', - 'base/videoadapter_unittest.cc', - 'base/videobroadcaster_unittest.cc', - 'base/videocapturer_unittest.cc', - 'base/videocommon_unittest.cc', - 'base/videoengine_unittest.h', - 'base/videoframe_unittest.h', - 'engine/nullwebrtcvideoengine_unittest.cc', - 'engine/payload_type_mapper_unittest.cc', - 'engine/simulcast_unittest.cc', - 'engine/webrtcmediaengine_unittest.cc', - 'engine/webrtcvideocapturer_unittest.cc', - 'engine/webrtcvideoframe_unittest.cc', - 'engine/webrtcvideoframefactory_unittest.cc', - 'engine/webrtcvideoengine2_unittest.cc', - 'engine/webrtcvoiceengine_unittest.cc', - 'sctp/sctpdataengine_unittest.cc', - ], - # TODO(kjellander): Make the code compile without disabling these flags. - # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 - 'cflags': [ - '-Wno-sign-compare', - ], - 'cflags_cc!': [ - '-Woverloaded-virtual', - ], - 'msvs_disabled_warnings': [ - 4245, # conversion from 'int' to 'uint32_t', signed/unsigned mismatch. - 4389, # signed/unsigned mismatch. - ], - 'conditions': [ - ['rtc_use_h264==1', { - 'defines': [ - 'WEBRTC_USE_H264' - ] - }], - ['OS=="win"', { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - # TODO(ronghuawu): Since we've included strmiids in - # libjingle_media target, we shouldn't need this here. - # Find out why it doesn't work without this. - 'strmiids.lib', - ], - }, - }, - }], - ['OS=="win" and clang==1', { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'AdditionalOptions': [ - # Disable warnings failing when compiling with Clang on Windows. - # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 - '-Wno-sign-compare', - '-Wno-unused-function', - ], - }, - }, - },], - ['clang==1', { - # TODO(kjellander): Make the code compile without disabling these. - # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 - 'cflags!': [ - '-Wextra', - ], - 'xcode_settings': { - 'WARNING_CFLAGS!': ['-Wextra'], - }, - }], - ['OS=="ios"', { - 'mac_bundle_resources': [ - '<(DEPTH)/resources/media/captured-320x240-2s-48.frames', - '<(DEPTH)/resources/media/faces.1280x720_P420.yuv', - '<(DEPTH)/resources/media/faces_I420.jpg', - '<(DEPTH)/resources/media/faces_I422.jpg', - '<(DEPTH)/resources/media/faces_I444.jpg', - '<(DEPTH)/resources/media/faces_I411.jpg', - '<(DEPTH)/resources/media/faces_I400.jpg', - ], - }], - ], - }, # target rtc_media_unittests - ], # targets - 'conditions': [ - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'rtc_media_unittests_run', - 'type': 'none', - 'dependencies': [ - 'rtc_media_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'rtc_media_unittests.isolate', - ], - }, - ], - }], - ], # conditions - }], # include_tests==1 - ], # conditions } diff --git a/webrtc/media/rtc_media_unittests.isolate b/webrtc/media/rtc_media_unittests.isolate deleted file mode 100644 index 1bfc4cbcfa..0000000000 --- a/webrtc/media/rtc_media_unittests.isolate +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (c) 2016 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/rtc_media_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(PRODUCT_DIR)/rtc_media_unittests<(EXECUTABLE_SUFFIX)', - '<(DEPTH)/resources/media/captured-320x240-2s-48.frames', - '<(DEPTH)/resources/media/faces.1280x720_P420.yuv', - '<(DEPTH)/resources/media/faces_I420.jpg', - '<(DEPTH)/resources/media/faces_I422.jpg', - '<(DEPTH)/resources/media/faces_I444.jpg', - '<(DEPTH)/resources/media/faces_I411.jpg', - '<(DEPTH)/resources/media/faces_I400.jpg', - ], - }, - }], - ], -} diff --git a/webrtc/modules/audio_codec_speed_tests.isolate b/webrtc/modules/audio_codec_speed_tests.isolate deleted file mode 100644 index c559d54bff..0000000000 --- a/webrtc/modules/audio_codec_speed_tests.isolate +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2014 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', { - 'variables': { - 'files': [ - '<(DEPTH)/resources/audio_coding/music_stereo_48kHz.pcm', - '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm', - '<(DEPTH)/resources/audio_coding/speech_mono_32_48kHz.pcm', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/audio_codec_speed_tests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/DEPS', - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/audio_codec_speed_tests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/modules/audio_codec_speed_tests_apk.isolate b/webrtc/modules/audio_codec_speed_tests_apk.isolate deleted file mode 100644 index 2122df8473..0000000000 --- a/webrtc/modules/audio_codec_speed_tests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../../build/android/android.isolate', - 'audio_codec_speed_tests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_audio_codec_speed_tests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../build/config/', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/audio_codec_speed_tests_apk/', - '<(PRODUCT_DIR)/bin/run_audio_codec_speed_tests', - 'audio_codec_speed_tests.isolate', - ] - } -} diff --git a/webrtc/modules/audio_coding/audio_coding.gypi b/webrtc/modules/audio_coding/audio_coding.gypi index 1e14b7c064..cb318ec777 100644 --- a/webrtc/modules/audio_coding/audio_coding.gypi +++ b/webrtc/modules/audio_coding/audio_coding.gypi @@ -191,80 +191,5 @@ ['include_opus==1', { 'includes': ['codecs/opus/opus.gypi',], }], - ['include_tests==1', { - 'targets': [ - { - 'target_name': 'acm_receive_test', - 'type': 'static_library', - 'defines': [ - '<@(audio_coding_defines)', - ], - 'dependencies': [ - '<@(audio_coding_dependencies)', - 'audio_coding_module', - 'neteq_unittest_tools', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'acm2/acm_receive_test_oldapi.cc', - 'acm2/acm_receive_test_oldapi.h', - ], - }, # acm_receive_test - { - 'target_name': 'acm_send_test', - 'type': 'static_library', - 'defines': [ - '<@(audio_coding_defines)', - ], - 'dependencies': [ - '<@(audio_coding_dependencies)', - 'audio_coding_module', - 'neteq_unittest_tools', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'acm2/acm_send_test_oldapi.cc', - 'acm2/acm_send_test_oldapi.h', - ], - }, # acm_send_test - { - 'target_name': 'delay_test', - 'type': 'executable', - 'dependencies': [ - 'audio_coding_module', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/common.gyp:webrtc_common', - '<(webrtc_root)/test/test.gyp:test_support', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', - '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - ], - 'sources': [ - 'test/delay_test.cc', - 'test/Channel.cc', - 'test/PCMFile.cc', - 'test/utility.cc', - ], - }, # delay_test - { - 'target_name': 'insert_packet_with_timing', - 'type': 'executable', - 'dependencies': [ - 'audio_coding_module', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/common.gyp:webrtc_common', - '<(webrtc_root)/test/test.gyp:test_support', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', - '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - ], - 'sources': [ - 'test/insert_packet_with_timing.cc', - 'test/Channel.cc', - 'test/PCMFile.cc', - ], - }, # delay_test - ], - }], ], } diff --git a/webrtc/modules/audio_coding/codecs/g711/g711.gypi b/webrtc/modules/audio_coding/codecs/g711/g711.gypi index 4b902809ea..d209628528 100644 --- a/webrtc/modules/audio_coding/codecs/g711/g711.gypi +++ b/webrtc/modules/audio_coding/codecs/g711/g711.gypi @@ -26,20 +26,4 @@ ], }, ], # targets - 'conditions': [ - ['include_tests==1', { - 'targets': [ - { - 'target_name': 'g711_test', - 'type': 'executable', - 'dependencies': [ - 'g711', - ], - 'sources': [ - 'test/testG711.cc', - ], - }, - ], # targets - }], # include_tests - ], # conditions } diff --git a/webrtc/modules/audio_coding/codecs/g722/g722.gypi b/webrtc/modules/audio_coding/codecs/g722/g722.gypi index 82b7b2e797..13c6f2dcb7 100644 --- a/webrtc/modules/audio_coding/codecs/g722/g722.gypi +++ b/webrtc/modules/audio_coding/codecs/g722/g722.gypi @@ -26,21 +26,4 @@ ], }, ], # targets - 'conditions': [ - ['include_tests==1', { - 'targets': [ - { - 'target_name': 'g722_test', - 'type': 'executable', - 'dependencies': [ - 'g722', - '<(webrtc_root)/common.gyp:webrtc_common' - ], - 'sources': [ - 'test/testG722.cc', - ], - }, - ], # targets - }], # include_tests - ], # conditions } diff --git a/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi b/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi index 27dfd883de..762a8fab1a 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi +++ b/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi @@ -163,25 +163,4 @@ ], # sources }, # ilbc ], # targets - 'conditions': [ - ['include_tests==1', { - 'targets': [ - { - 'target_name': 'ilbc_test', - 'type': 'executable', - 'dependencies': [ - 'ilbc', - ], - 'sources': [ - # The empty .cc file is a hack to get GYP to use the C++ - # linker even though all sources here are .c files; this - # is necessary because we transitively depend on - # rtc_base_approved, which calls the C++ standard library. - 'test/empty.cc', - 'test/iLBC_test.c', - ], - }, # ilbc_test - ], # targets - }], # include_tests - ], # conditions } diff --git a/webrtc/modules/audio_coding/codecs/opus/opus.gypi b/webrtc/modules/audio_coding/codecs/opus/opus.gypi index 10b9da96c4..9f6ef3e4b4 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus.gypi +++ b/webrtc/modules/audio_coding/codecs/opus/opus.gypi @@ -50,24 +50,4 @@ ], }, ], - 'conditions': [ - ['include_tests==1', { - 'targets': [ - { - 'target_name': 'webrtc_opus_fec_test', - 'type': 'executable', - 'dependencies': [ - 'webrtc_opus', - '<(webrtc_root)/base/base.gyp:rtc_base_approved', - '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'opus_fec_test.cc', - ], - }, - ], - }], - ], } diff --git a/webrtc/modules/audio_coding/neteq/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi index d9c152e184..630076ec8d 100644 --- a/webrtc/modules/audio_coding/neteq/neteq.gypi +++ b/webrtc/modules/audio_coding/neteq/neteq.gypi @@ -134,129 +134,4 @@ ], }, ], # targets - 'conditions': [ - ['include_tests==1', { - 'includes': ['neteq_tests.gypi',], - 'targets': [ - { - 'target_name': 'audio_decoder_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '<@(codecs)', - 'g722', - 'ilbc', - 'isac', - 'isac_fix', - 'audio_decoder_interface', - 'neteq_unittest_tools', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/test/test.gyp:test_support_main', - ], - 'defines': [ - '<@(neteq_defines)', - ], - 'sources': [ - 'audio_decoder_unittest.cc', - ], - 'conditions': [ - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - ['OS=="ios"', { - 'mac_bundle_resources': [ - '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm', - ], - }], - ], - }, # audio_decoder_unittests - - { - 'target_name': 'rtc_event_log_source', - 'type': 'static_library', - 'dependencies': [ - '<(webrtc_root)/webrtc.gyp:rtc_event_log_parser', - '<(webrtc_root)/webrtc.gyp:rtc_event_log_proto', - ], - 'export_dependent_settings': [ - '<(webrtc_root)/webrtc.gyp:rtc_event_log_parser', - ], - 'sources': [ - 'tools/rtc_event_log_source.h', - 'tools/rtc_event_log_source.cc', - ], - }, - - { - 'target_name': 'neteq_unittest_proto', - 'type': 'static_library', - 'sources': [ - 'neteq_unittest.proto', - ], - 'variables': { - 'proto_in_dir': '.', - # Workaround to protect against gyp's pathname relativization when - # this file is included by modules.gyp. - 'proto_out_protected': 'webrtc/audio_coding/neteq', - 'proto_out_dir': '<(proto_out_protected)', - }, - 'includes': ['../../../build/protoc.gypi',], - }, - - { - 'target_name': 'neteq_unittest_tools', - 'type': 'static_library', - 'dependencies': [ - 'neteq', - 'rtp_rtcp', - 'rtc_event_log_source', - '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/test/test.gyp:rtp_test_utils', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'tools', - ], - }, - 'include_dirs': [ - 'tools', - ], - 'sources': [ - 'tools/audio_checksum.h', - 'tools/audio_loop.cc', - 'tools/audio_loop.h', - 'tools/audio_sink.h', - 'tools/audio_sink.cc', - 'tools/constant_pcm_packet_source.cc', - 'tools/constant_pcm_packet_source.h', - 'tools/fake_decode_from_file.cc', - 'tools/fake_decode_from_file.h', - 'tools/input_audio_file.cc', - 'tools/input_audio_file.h', - 'tools/neteq_input.h', - 'tools/neteq_packet_source_input.cc', - 'tools/neteq_packet_source_input.h', - 'tools/neteq_replacement_input.cc', - 'tools/neteq_replacement_input.h', - 'tools/neteq_test.cc', - 'tools/neteq_test.h', - 'tools/output_audio_file.h', - 'tools/output_wav_file.h', - 'tools/packet.cc', - 'tools/packet.h', - 'tools/packet_source.cc', - 'tools/packet_source.h', - 'tools/resample_input_audio_file.cc', - 'tools/resample_input_audio_file.h', - 'tools/rtp_file_source.cc', - 'tools/rtp_file_source.h', - 'tools/rtp_generator.cc', - 'tools/rtp_generator.h', - ], - }, # neteq_unittest_tools - ], # targets - }], # include_tests - ], # conditions } diff --git a/webrtc/modules/audio_decoder_unittests.isolate b/webrtc/modules/audio_decoder_unittests.isolate deleted file mode 100644 index bec68f17c6..0000000000 --- a/webrtc/modules/audio_decoder_unittests.isolate +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', { - 'variables': { - 'files': [ - '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/DEPS', - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/modules/audio_decoder_unittests_apk.isolate b/webrtc/modules/audio_decoder_unittests_apk.isolate deleted file mode 100644 index 427559dcb0..0000000000 --- a/webrtc/modules/audio_decoder_unittests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../../build/android/android.isolate', - 'audio_decoder_unittests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_audio_decoder_unittests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../build/config/', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/audio_decoder_unittests_apk/', - '<(PRODUCT_DIR)/bin/run_audio_decoder_unittests', - 'audio_decoder_unittests.isolate', - ] - } -} diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi index 7d9e227bd4..725d9354ef 100644 --- a/webrtc/modules/audio_device/audio_device.gypi +++ b/webrtc/modules/audio_device/audio_device.gypi @@ -255,28 +255,5 @@ ], # conditions }, ], - 'conditions': [ - # Does not compile on iOS: webrtc:4755. - ['include_tests==1 and OS!="ios"', { - 'targets': [ - { - 'target_name': 'audio_device_tests', - 'type': 'executable', - 'dependencies': [ - 'audio_device', - 'webrtc_utility', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', - ], - 'sources': [ - 'test/audio_device_test_api.cc', - 'test/audio_device_test_defines.h', - ], - }, - ], # targets - }], # include_tests==1 and OS!=ios - ], } diff --git a/webrtc/modules/audio_device_tests.isolate b/webrtc/modules/audio_device_tests.isolate deleted file mode 100644 index f5a0c18444..0000000000 --- a/webrtc/modules/audio_device_tests.isolate +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/audio_device_tests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index 8a4d17199d..3037b5604e 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -28,791 +28,4 @@ 'video_capture/video_capture.gypi', 'video_processing/video_processing.gypi', ], - 'conditions': [ - ['include_tests==1', { - 'includes': [ - 'audio_coding/audio_coding_tests.gypi', - 'audio_processing/audio_processing_tests.gypi', - 'rtp_rtcp/test/testFec/test_fec.gypi', - 'video_coding/video_coding_test.gypi', - 'video_coding/codecs/test/video_codecs_test_framework.gypi', - 'video_coding/codecs/tools/video_codecs_tools.gypi', - ], # includes - 'variables': { - 'conditions': [ - # Desktop capturer is supported only on Windows, OSX and Linux. - ['OS=="win" or OS=="mac" or OS=="linux"', { - 'desktop_capture_supported%': 1, - }, { - 'desktop_capture_supported%': 0, - }], - ['rtc_use_h264==1', { - 'videoprocessor_defines': [ - 'WEBRTC_VIDEOPROCESSOR_H264_TESTS', - ], - }, { - 'videoprocessor_defines': [], - }], - ], - }, - 'targets': [ - { - 'target_name': 'modules_tests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/common.gyp:webrtc_common', - '<(webrtc_root)/common_video/common_video.gyp:common_video', - '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/test/test.gyp:test_support', - '<(webrtc_root)/test/test.gyp:test_support_main', - 'audio_coding_module', - 'rtp_rtcp', - 'video_codecs_test_framework', - 'webrtc_utility', - 'webrtc_video_coding', - ], - 'defines': [ - '<@(audio_coding_defines)', - '<@(videoprocessor_defines)', - ], - 'sources': [ - 'audio_coding/test/APITest.cc', - 'audio_coding/test/Channel.cc', - 'audio_coding/test/EncodeDecodeTest.cc', - 'audio_coding/test/PCMFile.cc', - 'audio_coding/test/PacketLossTest.cc', - 'audio_coding/test/RTPFile.cc', - 'audio_coding/test/TestAllCodecs.cc', - 'audio_coding/test/TestRedFec.cc', - 'audio_coding/test/TestStereo.cc', - 'audio_coding/test/TestVADDTX.cc', - 'audio_coding/test/Tester.cc', - 'audio_coding/test/TwoWayCommunication.cc', - 'audio_coding/test/iSACTest.cc', - 'audio_coding/test/opus_test.cc', - 'audio_coding/test/target_delay_unittest.cc', - 'audio_coding/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', - ], - 'conditions': [ - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - ['OS=="ios"', { - 'mac_bundle_resources': [ - '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm', - '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm', - '<(DEPTH)/resources/foreman_cif.yuv', - '<(DEPTH)/resources/paris_qcif.yuv', - ], - }], - ], - }, - { - '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_mixer', - 'audio_network_adaptor', - 'audio_processing', - 'audioproc_test_utils', - 'bitrate_controller', - 'builtin_audio_decoder_factory', - 'bwe_simulator', - 'cng', - '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)/base/base.gyp:rtc_base_approved', - '<(webrtc_root)/common.gyp:webrtc_common', - '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/common_video/common_video.gyp:common_video', - '<(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:video_test_common', - '<(webrtc_root)/test/test.gyp:rtp_test_utils', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(webrtc_root)/test/test.gyp:test_common', - ], - 'sources': [ - 'audio_coding/acm2/acm_receiver_unittest_oldapi.cc', - 'audio_coding/acm2/audio_coding_module_unittest_oldapi.cc', - 'audio_coding/acm2/call_statistics_unittest.cc', - 'audio_coding/acm2/codec_manager_unittest.cc', - 'audio_coding/acm2/initial_delay_manager_unittest.cc', - 'audio_coding/acm2/rent_a_codec_unittest.cc', - 'audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc', - 'audio_coding/audio_network_adaptor/channel_controller_unittest.cc', - 'audio_coding/audio_network_adaptor/controller_manager_unittest.cc', - 'audio_coding/audio_network_adaptor/mock/mock_controller.h', - 'audio_coding/audio_network_adaptor/mock/mock_controller_manager.h', - 'audio_coding/codecs/audio_decoder_factory_unittest.cc', - 'audio_coding/codecs/cng/audio_encoder_cng_unittest.cc', - 'audio_coding/codecs/cng/cng_unittest.cc', - 'audio_coding/codecs/ilbc/ilbc_unittest.cc', - 'audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc', - 'audio_coding/codecs/isac/fix/source/filters_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/mock/mock_audio_encoder.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/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/nack_tracker_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/tick_timer_unittest.cc', - 'audio_coding/neteq/time_stretch_unittest.cc', - 'audio_coding/neteq/timestamp_scaler_unittest.cc', - '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_mixer/test/audio_mixer_unittest.cc', - 'audio_processing/aec/echo_cancellation_unittest.cc', - 'audio_processing/aec/system_delay_unittest.cc', - 'audio_processing/agc/agc_manager_direct_unittest.cc', - 'audio_processing/agc/loudness_histogram_unittest.cc', - 'audio_processing/agc/mock_agc.h', - 'audio_processing/audio_buffer_unittest.cc', - '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/config_unittest.cc', - 'audio_processing/echo_cancellation_impl_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/block_mean_calculator_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', - 'congestion_controller/congestion_controller_unittest.cc', - 'congestion_controller/delay_based_bwe_unittest.cc', - 'congestion_controller/delay_based_bwe_unittest_helper.cc', - 'congestion_controller/delay_based_bwe_unittest_helper.h', - 'congestion_controller/probe_bitrate_estimator_unittest.cc', - 'congestion_controller/probe_controller_unittest.cc', - '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_estimator.h', - 'remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h', - 'remote_bitrate_estimator/inter_arrival_unittest.cc', - 'remote_bitrate_estimator/overuse_detector_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/estimators/nada_unittest.cc', - 'remote_bitrate_estimator/test/metric_recorder_unittest.cc', - 'remote_bitrate_estimator/transport_feedback_adapter_unittest.cc', - '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/mock/mock_rtp_payload_strategy.h', - 'rtp_rtcp/source/nack_rtx_unittest.cc', - 'rtp_rtcp/source/packet_loss_stats_unittest.cc', - 'rtp_rtcp/source/playout_delay_oracle_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_packet/app_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/bye_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/common_header_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/fir_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/nack_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/pli_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/remb_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/report_block_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/rpsi_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/sdes_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/sli_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc', - 'rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc', - 'rtp_rtcp/source/rtcp_packet_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_header_extension_unittest.cc', - 'rtp_rtcp/source/rtp_packet_history_unittest.cc', - 'rtp_rtcp/source/rtp_packet_unittest.cc', - 'rtp_rtcp/source/rtp_payload_registry_unittest.cc', - 'rtp_rtcp/source/rtp_rtcp_impl_unittest.cc', - 'rtp_rtcp/source/rtp_sender_unittest.cc', - 'rtp_rtcp/source/time_util_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/decoding_state_unittest.cc', - 'video_coding/frame_buffer2_unittest.cc', - 'video_coding/histogram_unittest.cc', - 'video_coding/include/mock/mock_vcm_callbacks.h', - 'video_coding/jitter_buffer_unittest.cc', - 'video_coding/jitter_estimator_tests.cc', - 'video_coding/nack_module_unittest.cc', - 'video_coding/percentile_filter_unittest.cc', - 'video_coding/protection_bitrate_calculator_unittest.cc', - 'video_coding/receiver_unittest.cc', - 'video_coding/rtp_frame_reference_finder_unittest.cc', - 'video_coding/sequence_number_util_unittest.cc', - 'video_coding/session_info_unittest.cc', - 'video_coding/test/stream_generator.cc', - 'video_coding/test/stream_generator.h', - 'video_coding/timing_unittest.cc', - 'video_coding/utility/frame_dropper_unittest.cc', - 'video_coding/utility/h264_bitstream_parser_unittest.cc', - 'video_coding/utility/ivf_file_writer_unittest.cc', - 'video_coding/utility/moving_average_unittest.cc', - 'video_coding/utility/quality_scaler_unittest.cc', - 'video_coding/utility/simulcast_rate_allocator_unittest.cc', - 'video_coding/video_coding_robustness_unittest.cc', - 'video_coding/video_packet_buffer_unittest.cc', - 'video_coding/video_receiver_unittest.cc', - 'video_coding/video_sender_unittest.cc', - 'video_processing/test/denoiser_test.cc', - 'video_processing/test/video_processing_unittest.cc', - 'video_processing/test/video_processing_unittest.h', - ], - 'conditions': [ - ['apm_debug_dump==1', { - 'defines': ['WEBRTC_APM_DEBUG_DUMP=1',], - }, { - 'defines': ['WEBRTC_APM_DEBUG_DUMP=0',], - }], - ['enable_intelligibility_enhancer==1', { - 'defines': ['WEBRTC_INTELLIGIBILITY_ENHANCER=1',], - 'sources': [ - 'audio_processing/intelligibility/intelligibility_enhancer_unittest.cc', - 'audio_processing/intelligibility/intelligibility_utils_unittest.cc', - ], - }, { - 'defines': ['WEBRTC_INTELLIGIBILITY_ENHANCER=0',], - }], - ['libvpx_build_vp9==1', { - 'sources': [ - 'video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc', - ], - }], - ['enable_bwe_test_logging==1', { - 'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1' ], - }, { - 'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ], - }], - # Run screen/window capturer tests only on platforms where they are - # supported. - ['desktop_capture_supported==1 or OS=="android"', { - 'dependencies': [ - 'desktop_capture', - ], - 'sources': [ - 'desktop_capture/desktop_region_unittest.cc', - 'desktop_capture/differ_block_unittest.cc', - 'desktop_capture/differ_unittest.cc', - ], - }], - ['desktop_capture_supported==1', { - 'sources': [ - 'desktop_capture/desktop_and_cursor_composer_unittest.cc', - 'desktop_capture/mouse_cursor_monitor_unittest.cc', - 'desktop_capture/rgba_color.cc', - 'desktop_capture/rgba_color.h', - 'desktop_capture/screen_capturer_differ_wrapper_unittest.cc', - 'desktop_capture/screen_capturer_helper_unittest.cc', - 'desktop_capture/screen_capturer_mac_unittest.cc', - 'desktop_capture/fake_desktop_capturer.h', - 'desktop_capture/fake_screen_capturer.cc', - 'desktop_capture/fake_screen_capturer.h', - 'desktop_capture/desktop_frame_generator.cc', - 'desktop_capture/desktop_frame_generator.h', - 'desktop_capture/screen_capturer_mock_objects.h', - 'desktop_capture/screen_capturer_unittest.cc', - 'desktop_capture/screen_drawer.h', - 'desktop_capture/screen_drawer_linux.cc', - 'desktop_capture/screen_drawer_mac.cc', - 'desktop_capture/screen_drawer_unittest.cc', - 'desktop_capture/screen_drawer_win.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', - ], - }], - ['prefer_fixed_point==1', { - 'defines': [ 'WEBRTC_AUDIOPROC_FIXED_PROFILE' ], - }, { - 'defines': [ 'WEBRTC_AUDIOPROC_FLOAT_PROFILE' ], - }], - ['enable_protobuf==1', { - 'defines': [ - 'WEBRTC_AUDIOPROC_DEBUG_DUMP', - 'WEBRTC_NETEQ_UNITTEST_BITEXACT', - ], - 'dependencies': [ - 'audioproc_protobuf_utils', - 'audioproc_unittest_proto', - 'neteq_unittest_proto', - ], - 'sources': [ - 'audio_processing/audio_processing_impl_locking_unittest.cc', - 'audio_processing/audio_processing_impl_unittest.cc', - 'audio_processing/audio_processing_unittest.cc', - 'audio_processing/echo_cancellation_bit_exact_unittest.cc', - 'audio_processing/echo_control_mobile_unittest.cc', - 'audio_processing/gain_control_unittest.cc', - 'audio_processing/high_pass_filter_unittest.cc', - 'audio_processing/level_controller/level_controller_unittest.cc', - 'audio_processing/level_estimator_unittest.cc', - 'audio_processing/noise_suppression_unittest.cc', - 'audio_processing/voice_detection_unittest.cc', - 'audio_processing/test/bitexactness_tools.cc', - 'audio_processing/test/bitexactness_tools.h', - 'audio_processing/test/debug_dump_replayer.cc', - 'audio_processing/test/debug_dump_replayer.h', - 'audio_processing/test/debug_dump_test.cc', - 'audio_processing/test/test_utils.h', - ], - }], - ['build_libvpx==1', { - 'dependencies': [ - '<(libvpx_dir)/libvpx.gyp:libvpx', - ], - }], - ['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"', { - 'includes': [ - '../build/objc_common.gypi', - ], - 'sources': [ - 'video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc', - 'audio_device/ios/audio_device_unittest_ios.cc', - 'audio_device/ios/objc/RTCAudioSessionTest.mm', - ], - 'xcode_settings': { - 'OTHER_LDFLAGS': ['-ObjC'], - }, - # This needs to be kept in sync with modules_unittests.isolate. - 'mac_bundle_resources': [ - '<(DEPTH)/data/audio_processing/output_data_float.pb', - '<(DEPTH)/data/audio_processing/output_data_mac.pb', - '<(DEPTH)/data/voice_engine/audio_tiny48.wav', - '<(DEPTH)/resources/att-downlink.rx', - '<(DEPTH)/resources/att-uplink.rx', - '<(DEPTH)/resources/audio_coding/neteq_opus.rtp', - '<(DEPTH)/resources/audio_coding/neteq_universal_new.rtp', - '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm', - '<(DEPTH)/resources/audio_coding/speech_mono_32_48kHz.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_audio.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_vad.dat', - '<(DEPTH)/resources/audio_processing/agc/agc_voicing_prob.dat', - '<(DEPTH)/resources/audio_processing/agc/agc_with_circular_buffer.dat', - '<(DEPTH)/resources/audio_processing/transient/ajm-macbook-1-spke16m.pcm', - '<(DEPTH)/resources/audio_processing/transient/audio16kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/audio32kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/audio48kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/audio8kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/detect16kHz.dat', - '<(DEPTH)/resources/audio_processing/transient/detect32kHz.dat', - '<(DEPTH)/resources/audio_processing/transient/detect48kHz.dat', - '<(DEPTH)/resources/audio_processing/transient/detect8kHz.dat', - '<(DEPTH)/resources/audio_processing/transient/double-utils.dat', - '<(DEPTH)/resources/audio_processing/transient/float-utils.dat', - '<(DEPTH)/resources/audio_processing/transient/suppressed16kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/suppressed32kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/suppressed8kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/wpd0.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd1.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd2.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd3.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd4.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd5.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd6.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd7.dat', - '<(DEPTH)/resources/deflicker_before_cif_short.yuv', - '<(DEPTH)/resources/far16_stereo.pcm', - '<(DEPTH)/resources/far32_stereo.pcm', - '<(DEPTH)/resources/far44_stereo.pcm', - '<(DEPTH)/resources/far48_stereo.pcm', - '<(DEPTH)/resources/far8_stereo.pcm', - '<(DEPTH)/resources/foremanColorEnhanced_cif_short.yuv', - '<(DEPTH)/resources/foreman_cif.yuv', - '<(DEPTH)/resources/foreman_cif_short.yuv', - '<(DEPTH)/resources/near16_stereo.pcm', - '<(DEPTH)/resources/near32_stereo.pcm', - '<(DEPTH)/resources/near44_stereo.pcm', - '<(DEPTH)/resources/near48_stereo.pcm', - '<(DEPTH)/resources/near8_stereo.pcm', - '<(DEPTH)/resources/ref03.aecdump', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin', - '<(DEPTH)/resources/short_mixed_mono_48.dat', - '<(DEPTH)/resources/short_mixed_mono_48_arm.dat', - '<(DEPTH)/resources/short_mixed_mono_48.pcm', - '<(DEPTH)/resources/short_mixed_stereo_48.dat', - '<(DEPTH)/resources/short_mixed_stereo_48.pcm', - '<(DEPTH)/resources/sprint-downlink.rx', - '<(DEPTH)/resources/sprint-uplink.rx', - '<(DEPTH)/resources/synthetic-trace.rx', - '<(DEPTH)/resources/tmobile-downlink.rx', - '<(DEPTH)/resources/tmobile-uplink.rx', - '<(DEPTH)/resources/utility/encapsulated_pcm16b_8khz.wav', - '<(DEPTH)/resources/utility/encapsulated_pcmu_8khz.wav', - '<(DEPTH)/resources/verizon3g-downlink.rx', - '<(DEPTH)/resources/verizon3g-uplink.rx', - '<(DEPTH)/resources/verizon4g-downlink.rx', - '<(DEPTH)/resources/verizon4g-uplink.rx', - '<(DEPTH)/resources/video_coding/frame-ethernet-ii.pcap', - '<(DEPTH)/resources/video_coding/frame-loopback.pcap', - '<(DEPTH)/resources/video_coding/pltype103.rtp', - '<(DEPTH)/resources/video_coding/ssrcs-2.pcap', - '<(DEPTH)/resources/video_coding/ssrcs-3.pcap', - ], - }], - ], - # Disable warnings to enable Win64 build, issue 1323. - 'msvs_disabled_warnings': [ - 4267, # size_t to int truncation. - ], - }, - ], - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'audio_codec_speed_tests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):audio_codec_speed_tests_apk', - ], - }, - { - 'target_name': 'audio_decoder_unittests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):audio_decoder_unittests_apk', - ], - }, - { - 'target_name': 'modules_tests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):modules_tests_apk', - ], - }, - { - 'target_name': 'modules_unittests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):modules_unittests_apk', - ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', - { - 'targets': [ - { - 'target_name': 'audio_codec_speed_tests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):audio_codec_speed_tests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'audio_codec_speed_tests_apk.isolate', - ], - }, - { - 'target_name': 'audio_decoder_unittests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):audio_decoder_unittests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'audio_decoder_unittests_apk.isolate', - ], - }, - { - 'target_name': 'modules_tests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):modules_tests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'modules_tests_apk.isolate', - ], - }, - { - 'target_name': 'modules_unittests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):modules_unittests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'modules_unittests_apk.isolate', - ], - }, - ], - }, - ], - ], - }], # OS=="android" - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'audio_codec_speed_tests_run', - 'type': 'none', - 'dependencies': [ - 'audio_codec_speed_tests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'audio_codec_speed_tests.isolate', - ], - }, - { - 'target_name': 'audio_decoder_unittests_run', - 'type': 'none', - 'dependencies': [ - 'audio_decoder_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'audio_decoder_unittests.isolate', - ], - }, - { - 'target_name': 'audio_device_tests_run', - 'type': 'none', - 'dependencies': [ - 'audio_device_tests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'audio_device_tests.isolate', - ], - }, - { - 'target_name': 'modules_tests_run', - 'type': 'none', - 'dependencies': [ - 'modules_tests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'modules_tests.isolate', - ], - }, - { - 'target_name': 'modules_unittests_run', - 'type': 'none', - 'dependencies': [ - 'modules_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'modules_unittests.isolate', - ], - }, - ], - }], - ], - }], # include_tests - ], # conditions } diff --git a/webrtc/modules/modules_tests.isolate b/webrtc/modules/modules_tests.isolate deleted file mode 100644 index 20234c3123..0000000000 --- a/webrtc/modules/modules_tests.isolate +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', { - 'variables': { - 'files': [ - '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm', - '<(DEPTH)/resources/audio_coding/teststereo32kHz.pcm', - '<(DEPTH)/resources/foreman_cif.yuv', - '<(DEPTH)/resources/paris_qcif.yuv', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/DEPS', - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/modules_tests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/modules/modules_tests_apk.isolate b/webrtc/modules/modules_tests_apk.isolate deleted file mode 100644 index ffdd967b4f..0000000000 --- a/webrtc/modules/modules_tests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../../build/android/android.isolate', - 'modules_tests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_modules_tests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../build/config/', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/modules_tests_apk/', - '<(PRODUCT_DIR)/bin/run_modules_tests', - 'modules_tests.isolate', - ] - } -} diff --git a/webrtc/modules/modules_unittests.isolate b/webrtc/modules/modules_unittests.isolate deleted file mode 100644 index af7e6ef46e..0000000000 --- a/webrtc/modules/modules_unittests.isolate +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="android"', { - 'variables': { - 'files': [ - '<(DEPTH)/data/audio_processing/output_data_fixed.pb', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', { - 'variables': { - 'files': [ - '<(DEPTH)/data/audio_processing/output_data_float.pb', - '<(DEPTH)/data/audio_processing/output_data_mac.pb', - '<(DEPTH)/data/voice_engine/audio_tiny48.wav', - '<(DEPTH)/resources/att-downlink.rx', - '<(DEPTH)/resources/att-uplink.rx', - '<(DEPTH)/resources/audio_coding/neteq_opus.rtp', - '<(DEPTH)/resources/audio_coding/neteq_universal_new.rtp', - '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm', - '<(DEPTH)/resources/audio_coding/speech_mono_32_48kHz.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_audio.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_vad.dat', - '<(DEPTH)/resources/audio_processing/agc/agc_voicing_prob.dat', - '<(DEPTH)/resources/audio_processing/agc/agc_with_circular_buffer.dat', - '<(DEPTH)/resources/audio_processing/transient/ajm-macbook-1-spke16m.pcm', - '<(DEPTH)/resources/audio_processing/transient/audio16kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/audio32kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/audio48kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/audio8kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/detect16kHz.dat', - '<(DEPTH)/resources/audio_processing/transient/detect32kHz.dat', - '<(DEPTH)/resources/audio_processing/transient/detect48kHz.dat', - '<(DEPTH)/resources/audio_processing/transient/detect8kHz.dat', - '<(DEPTH)/resources/audio_processing/transient/double-utils.dat', - '<(DEPTH)/resources/audio_processing/transient/float-utils.dat', - '<(DEPTH)/resources/audio_processing/transient/suppressed16kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/suppressed32kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/suppressed8kHz.pcm', - '<(DEPTH)/resources/audio_processing/transient/wpd0.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd1.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd2.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd3.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd4.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd5.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd6.dat', - '<(DEPTH)/resources/audio_processing/transient/wpd7.dat', - '<(DEPTH)/resources/deflicker_before_cif_short.yuv', - '<(DEPTH)/resources/far16_stereo.pcm', - '<(DEPTH)/resources/far32_stereo.pcm', - '<(DEPTH)/resources/far44_stereo.pcm', - '<(DEPTH)/resources/far48_stereo.pcm', - '<(DEPTH)/resources/far8_stereo.pcm', - '<(DEPTH)/resources/foremanColorEnhanced_cif_short.yuv', - '<(DEPTH)/resources/foreman_cif.yuv', - '<(DEPTH)/resources/foreman_cif_short.yuv', - '<(DEPTH)/resources/near16_stereo.pcm', - '<(DEPTH)/resources/near32_stereo.pcm', - '<(DEPTH)/resources/near44_stereo.pcm', - '<(DEPTH)/resources/near48_stereo.pcm', - '<(DEPTH)/resources/near8_stereo.pcm', - '<(DEPTH)/resources/ref03.aecdump', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke1_1_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingChoke2_1_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingDelay1_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_IncreasingLoss1_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_Multi1_1_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyChoke_1_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyDelay_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_SteadyLoss_0_TOF.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_AST.bin', - '<(DEPTH)/resources/remote_bitrate_estimator/VideoSendersTest_BweTest_UnlimitedSpeed_0_TOF.bin', - '<(DEPTH)/resources/short_mixed_mono_48.dat', - '<(DEPTH)/resources/short_mixed_mono_48_arm.dat', - '<(DEPTH)/resources/short_mixed_mono_48.pcm', - '<(DEPTH)/resources/short_mixed_stereo_48.dat', - '<(DEPTH)/resources/short_mixed_stereo_48.pcm', - '<(DEPTH)/resources/sprint-downlink.rx', - '<(DEPTH)/resources/sprint-uplink.rx', - '<(DEPTH)/resources/synthetic-trace.rx', - '<(DEPTH)/resources/tmobile-downlink.rx', - '<(DEPTH)/resources/tmobile-uplink.rx', - '<(DEPTH)/resources/utility/encapsulated_pcm16b_8khz.wav', - '<(DEPTH)/resources/utility/encapsulated_pcmu_8khz.wav', - '<(DEPTH)/resources/verizon3g-downlink.rx', - '<(DEPTH)/resources/verizon3g-uplink.rx', - '<(DEPTH)/resources/verizon4g-downlink.rx', - '<(DEPTH)/resources/verizon4g-uplink.rx', - ], - }, - }], - ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==0', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/DEPS', - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ['(OS=="linux" or OS=="mac" or OS=="win") and use_x11==1', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/xvfb.py', - '<(PRODUCT_DIR)', - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/DEPS', - '<(DEPTH)/testing/test_env.py', - '<(DEPTH)/testing/xvfb.py', - '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/modules/modules_unittests_apk.isolate b/webrtc/modules/modules_unittests_apk.isolate deleted file mode 100644 index cd60cf75c8..0000000000 --- a/webrtc/modules/modules_unittests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../../build/android/android.isolate', - 'modules_unittests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_modules_unittests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../build/config/', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/modules_unittests_apk/', - '<(PRODUCT_DIR)/bin/run_modules_unittests', - 'modules_unittests.isolate', - ] - } -} diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi index 1823617927..3a2e9ea915 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi @@ -61,55 +61,6 @@ 'conditions': [ ['include_tests==1', { 'targets': [ - { - 'target_name': 'bwe_simulator', - 'type': 'static_library', - 'dependencies': [ - '<(webrtc_root)/modules/modules.gyp:paced_sender', - '<(webrtc_root)/test/test.gyp:test_support', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(DEPTH)/testing/gmock.gyp:gmock', - ], - 'sources': [ - 'bwe_simulations.cc', - 'test/bwe.cc', - 'test/bwe.h', - 'test/bwe_test.cc', - 'test/bwe_test.h', - 'test/bwe_test_baselinefile.cc', - 'test/bwe_test_baselinefile.h', - 'test/bwe_test_fileutils.cc', - 'test/bwe_test_fileutils.h', - 'test/bwe_test_framework.cc', - 'test/bwe_test_framework.h', - 'test/bwe_test_logging.h', - 'test/metric_recorder.cc', - 'test/metric_recorder.h', - 'test/packet_receiver.cc', - 'test/packet_receiver.h', - 'test/packet_sender.cc', - 'test/packet_sender.h', - 'test/packet.h', - 'test/estimators/nada.cc', - 'test/estimators/nada.h', - 'test/estimators/remb.cc', - 'test/estimators/remb.h', - 'test/estimators/send_side.cc', - 'test/estimators/send_side.h', - 'test/estimators/tcp.cc', - 'test/estimators/tcp.h', - ], - 'conditions': [ - ['enable_bwe_test_logging==1', { - 'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1' ], - 'sources': [ - 'test/bwe_test_logging.cc' - ], - }, { - 'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ], - }], - ], - }, { 'target_name': 'bwe_tools_util', 'type': 'static_library', diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi index a2b2f58c9f..eb101478fe 100644 --- a/webrtc/modules/video_capture/video_capture.gypi +++ b/webrtc/modules/video_capture/video_capture.gypi @@ -162,61 +162,6 @@ }, ], }], # build_with_chromium==0 - ['include_tests==1 and OS!="android"', { - 'targets': [ - { - 'target_name': 'video_capture_tests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'video_capture_module', - 'video_capture_module_internal_impl', - 'webrtc_utility', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/test/test.gyp:video_test_common', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'test/video_capture_unittest.cc', - 'test/video_capture_main_mac.mm', - ], - 'conditions': [ - ['OS=="mac" or OS=="linux"', { - 'cflags': [ - '-Wno-write-strings', - ], - 'ldflags': [ - '-lpthread -lm', - ], - }], - ['OS=="linux"', { - 'libraries': [ - '-lrt', - '-lXext', - '-lX11', - ], - }], - ['OS=="mac"', { - 'dependencies': [ - # Link with a special main for mac so we can use the webcam. - '<(webrtc_root)/test/test.gyp:test_support_main_threaded_mac', - ], - 'xcode_settings': { - # TODO(andrew): CoreAudio and AudioToolbox shouldn't be needed. - 'OTHER_LDFLAGS': [ - '-framework Foundation -framework AppKit -framework Cocoa -framework OpenGL -framework CoreVideo -framework CoreAudio -framework AudioToolbox', - ], - }, - }], # OS=="mac" - ['OS!="mac"', { - 'dependencies': [ - # Otherwise, use the regular main. - '<(webrtc_root)/test/test.gyp:test_support_main', - ], - }], # OS!="mac" - ] # conditions - }, - ], # targets - }], ], } diff --git a/webrtc/modules/video_capture/video_capture_tests.isolate b/webrtc/modules/video_capture/video_capture_tests.isolate deleted file mode 100644 index a0668e7263..0000000000 --- a/webrtc/modules/video_capture/video_capture_tests.isolate +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/video_capture_tests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/modules/video_render_tests.isolate b/webrtc/modules/video_render_tests.isolate deleted file mode 100644 index ca59a8c3a7..0000000000 --- a/webrtc/modules/video_render_tests.isolate +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/video_render_tests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/pc/pc.gyp b/webrtc/pc/pc.gyp index 3ca5013297..f88a315b35 100755 --- a/webrtc/pc/pc.gyp +++ b/webrtc/pc/pc.gyp @@ -74,73 +74,4 @@ ], }, # target rtc_pc ], # targets - 'conditions': [ - ['include_tests==1', { - 'targets' : [ - { - 'target_name': 'rtc_pc_unittests', - 'type': 'executable', - 'dependencies': [ - '<(webrtc_root)/api/api.gyp:libjingle_peerconnection', - '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', - '<(webrtc_root)/media/media.gyp:rtc_unittest_main', - '<(webrtc_root)/pc/pc.gyp:rtc_pc', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', - ], - 'include_dirs': [ - '<(DEPTH)/third_party/libsrtp/srtp', - ], - 'sources': [ - 'bundlefilter_unittest.cc', - 'channel_unittest.cc', - 'channelmanager_unittest.cc', - 'currentspeakermonitor_unittest.cc', - 'mediasession_unittest.cc', - 'rtcpmuxfilter_unittest.cc', - 'srtpfilter_unittest.cc', - ], - 'conditions': [ - ['clang==0', { - 'cflags': [ - '-Wno-maybe-uninitialized', # Only exists for GCC. - ], - }], - ['build_libsrtp==1', { - 'dependencies': [ - '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp', - ], - }], - ['OS=="win"', { - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'strmiids.lib', - ], - }, - }, - }], - ], - }, # target rtc_pc_unittests - ], # targets - 'conditions': [ - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'rtc_pc_unittests_run', - 'type': 'none', - 'dependencies': [ - 'rtc_pc_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'rtc_pc_unittests.isolate', - ], - }, - ], - }], - ], # conditions - }], # include_tests==1 - ], # conditions } diff --git a/webrtc/pc/rtc_pc_unittests.isolate b/webrtc/pc/rtc_pc_unittests.isolate deleted file mode 100644 index 52d7e19dc3..0000000000 --- a/webrtc/pc/rtc_pc_unittests.isolate +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/rtc_pc_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(PRODUCT_DIR)/rtc_pc_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/rtc_unittests.isolate b/webrtc/rtc_unittests.isolate deleted file mode 100644 index 6dfe38d465..0000000000 --- a/webrtc/rtc_unittests.isolate +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2014 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/rtc_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(PRODUCT_DIR)/rtc_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/rtc_unittests_apk.isolate b/webrtc/rtc_unittests_apk.isolate deleted file mode 100644 index 14fd20a81d..0000000000 --- a/webrtc/rtc_unittests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../build/android/android.isolate', - 'rtc_unittests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_rtc_unittests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../build/config/', - '../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/rtc_unittests_apk/', - '<(PRODUCT_DIR)/bin/run_rtc_unittests', - 'rtc_unittests.isolate', - ] - }, -} diff --git a/webrtc/stats/stats.gyp b/webrtc/stats/stats.gyp index b2b99ccb27..49932e871e 100644 --- a/webrtc/stats/stats.gyp +++ b/webrtc/stats/stats.gyp @@ -25,26 +25,4 @@ ], }, ], - 'conditions': [ - ['include_tests==1', { - 'targets': [ - { - # GN version: webrtc/stats:rtc_stats_unittests - 'target_name': 'rtc_stats_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', - 'rtc_stats', - ], - 'sources': [ - 'rtcstats_unittest.cc', - 'rtcstatscollector_unittest.cc', - 'rtcstatsreport_unittest.cc', - ], - }, - ], - }], - ], } diff --git a/webrtc/system_wrappers/system_wrappers_tests.gyp b/webrtc/system_wrappers/system_wrappers_tests.gyp deleted file mode 100644 index c4453c3e2a..0000000000 --- a/webrtc/system_wrappers/system_wrappers_tests.gyp +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright (c) 2013 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': ['../build/common.gypi',], - 'targets': [ - { - 'target_name': 'system_wrappers_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/test/test.gyp:test_support_main', - ], - 'sources': [ - 'source/aligned_array_unittest.cc', - 'source/aligned_malloc_unittest.cc', - 'source/clock_unittest.cc', - 'source/condition_variable_unittest.cc', - 'source/critical_section_unittest.cc', - 'source/logging_unittest.cc', - 'source/data_log_helpers_unittest.cc', - 'source/data_log_c_helpers_unittest.c', - 'source/data_log_c_helpers_unittest.h', - 'source/event_timer_posix_unittest.cc', - 'source/metrics_default_unittest.cc', - 'source/metrics_unittest.cc', - 'source/ntp_time_unittest.cc', - 'source/rtp_to_ntp_unittest.cc', - 'source/stringize_macros_unittest.cc', - 'source/stl_util_unittest.cc', - ], - 'conditions': [ - ['enable_data_logging==1', { - 'sources': [ 'source/data_log_unittest.cc', ], - }, { - 'sources': [ 'source/data_log_unittest_disabled.cc', ], - }], - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - ], - # Disable warnings to enable Win64 build, issue 1323. - 'msvs_disabled_warnings': [ - 4267, # size_t to int truncation. - ], - }, - ], - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'system_wrappers_unittests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):system_wrappers_unittests_apk', - ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', - { - 'targets': [ - { - 'target_name': 'system_wrappers_unittests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):system_wrappers_unittests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'system_wrappers_unittests_apk.isolate', - ], - }, - ], - }, - ], - ], - }], # OS=="android" - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'system_wrappers_unittests_run', - 'type': 'none', - 'dependencies': [ - 'system_wrappers_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'system_wrappers_unittests.isolate', - ], - }, - ], - }], - ], -} - diff --git a/webrtc/system_wrappers/system_wrappers_unittests.isolate b/webrtc/system_wrappers/system_wrappers_unittests.isolate deleted file mode 100644 index ec8166402b..0000000000 --- a/webrtc/system_wrappers/system_wrappers_unittests.isolate +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/system_wrappers_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/system_wrappers/system_wrappers_unittests_apk.isolate b/webrtc/system_wrappers/system_wrappers_unittests_apk.isolate deleted file mode 100644 index 974064a71f..0000000000 --- a/webrtc/system_wrappers/system_wrappers_unittests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../../build/android/android.isolate', - 'system_wrappers_unittests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_system_wrappers_unittests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../build/config/', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/system_wrappers_unittests_apk/', - '<(PRODUCT_DIR)/bin/run_system_wrappers_unittests', - 'system_wrappers_unittests.isolate', - ] - } -} diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp index 86a32c3165..3ca146bfbd 100644 --- a/webrtc/test/test.gyp +++ b/webrtc/test/test.gyp @@ -150,42 +150,6 @@ ], }, { - 'target_name': 'test_support_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'test_common', - 'test_support_main', - '<(webrtc_root)/modules/modules.gyp:video_capture', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'fake_network_pipe_unittest.cc', - 'frame_generator_unittest.cc', - 'rtp_file_reader_unittest.cc', - 'rtp_file_writer_unittest.cc', - 'testsupport/always_passing_unittest.cc', - 'testsupport/unittest_utils.h', - 'testsupport/fileutils_unittest.cc', - 'testsupport/frame_reader_unittest.cc', - 'testsupport/frame_writer_unittest.cc', - 'testsupport/metrics/video_metrics_unittest.cc', - 'testsupport/packet_reader_unittest.cc', - 'testsupport/perf_test_unittest.cc', - ], - # Disable warnings to enable Win64 build, issue 1323. - 'msvs_disabled_warnings': [ - 4267, # size_t to int truncation. - ], - 'conditions': [ - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - ], - }, - { 'target_name': 'test_common', 'type': 'static_library', 'sources': [ @@ -326,55 +290,4 @@ }, }, ], - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'test_support_unittests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):test_support_unittests_apk', - ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', - { - 'targets': [ - { - 'target_name': 'test_support_unittests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):test_support_unittests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'test_support_unittests_apk.isolate', - ], - }, - ], - }, - ], - ], - }], # OS=="android" - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'test_support_unittests_run', - 'type': 'none', - 'dependencies': [ - 'test_support_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'test_support_unittests.isolate', - ], - }, - ], - }], - ], } diff --git a/webrtc/test/test_support_unittests.isolate b/webrtc/test/test_support_unittests.isolate deleted file mode 100644 index 827d379dfd..0000000000 --- a/webrtc/test/test_support_unittests.isolate +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', { - 'variables': { - 'files': [ - '<(DEPTH)/resources/foreman_cif_short.yuv', - '<(DEPTH)/resources/video_coding/frame-ethernet-ii.pcap', - '<(DEPTH)/resources/video_coding/frame-loopback.pcap', - '<(DEPTH)/resources/video_coding/pltype103.rtp', - '<(DEPTH)/resources/video_coding/pltype103_header_only.rtp', - '<(DEPTH)/resources/video_coding/ssrcs-2.pcap', - '<(DEPTH)/resources/video_coding/ssrcs-3.pcap', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/DEPS', - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/test_support_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/test/test_support_unittests_apk.isolate b/webrtc/test/test_support_unittests_apk.isolate deleted file mode 100644 index e52980b327..0000000000 --- a/webrtc/test/test_support_unittests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../../build/android/android.isolate', - 'test_support_unittests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_test_support_unittests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../build/config/', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/test_support_unittests_apk/', - '<(PRODUCT_DIR)/bin/run_test_support_unittests', - 'test_support_unittests.isolate', - ] - } -} diff --git a/webrtc/tools/tools.gyp b/webrtc/tools/tools.gyp index d1ff42bcbe..b58b0c779a 100644 --- a/webrtc/tools/tools.gyp +++ b/webrtc/tools/tools.gyp @@ -142,139 +142,5 @@ }, ], }], - ['enable_protobuf==1 and include_tests==1', { - # TODO(terelius): This tool requires the include_test condition to - # prevent build errors when gflags isn't found in downstream projects. - # There should be a cleaner way to do this. The tool is not test related. - 'targets': [ - { - # Command line tool for RTC event log visualization - 'target_name': 'event_log_visualizer', - 'type': 'executable', - 'dependencies': [ - 'event_log_visualizer_utils', - '<(webrtc_root)/test/test.gyp:field_trial', - '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - ], - 'sources': [ - 'event_log_visualizer/main.cc', - ], - }, - ], - }], - ['include_tests==1', { - 'targets' : [ - { - 'target_name': 'activity_metric', - 'type': 'executable', - 'dependencies': [ - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - '<(webrtc_root)/modules/modules.gyp:audio_processing', - ], - 'sources': [ - 'agc/activity_metric.cc', - ], - }, # activity_metric - { - 'target_name': 'tools_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'frame_editing_lib', - 'video_quality_analysis', - '<(webrtc_root)/tools/internal_tools.gyp:command_line_parser', - '<(webrtc_root)/test/test.gyp:test_support_main', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'simple_command_line_parser_unittest.cc', - 'frame_editing/frame_editing_unittest.cc', - 'frame_analyzer/video_quality_analysis_unittest.cc', - ], - # Disable warnings to enable Win64 build, issue 1323. - 'msvs_disabled_warnings': [ - 4267, # size_t to int truncation. - ], - 'conditions': [ - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - ], - }, # tools_unittests - { - 'target_name': 'rtp_analyzer', - 'type': 'none', - 'variables': { - 'copy_output_dir%': '<(PRODUCT_DIR)', - }, - 'copies': [ - { - 'destination': '<(copy_output_dir)/', - 'files': [ - 'py_event_log_analyzer/misc.py', - 'py_event_log_analyzer/pb_parse.py', - 'py_event_log_analyzer/rtp_analyzer.py', - 'py_event_log_analyzer/rtp_analyzer.sh', - ] - }, - ], - 'dependencies': [ '<(webrtc_root)/webrtc.gyp:rtc_event_log_proto' ], - 'process_outputs_as_sources': 1, - }, # rtp_analyzer - ], # targets - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'tools_unittests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):tools_unittests_apk', - ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', - { - 'targets': [ - { - 'target_name': 'tools_unittests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):tools_unittests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'tools_unittests_apk.isolate', - ], - }, - ], - }, - ], - ], - }], - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'tools_unittests_run', - 'type': 'none', - 'dependencies': [ - 'tools_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'tools_unittests.isolate', - ], - }, - ], - }], - ], - }], # include_tests ], # conditions } diff --git a/webrtc/tools/tools_unittests.isolate b/webrtc/tools/tools_unittests.isolate deleted file mode 100644 index ebe4714f7e..0000000000 --- a/webrtc/tools/tools_unittests.isolate +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', { - 'variables': { - 'files': [ - '<(DEPTH)/resources/foreman_cif.yuv', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/DEPS', - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/tools_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/tools/tools_unittests_apk.isolate b/webrtc/tools/tools_unittests_apk.isolate deleted file mode 100644 index a4ecb07903..0000000000 --- a/webrtc/tools/tools_unittests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../../build/android/android.isolate', - 'tools_unittests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_tools_unittests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../build/config/', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/tools_unittests_apk/', - '<(PRODUCT_DIR)/bin/run_tools_unittests', - 'tools_unittests.isolate', - ] - } -} diff --git a/webrtc/video_engine_tests.isolate b/webrtc/video_engine_tests.isolate deleted file mode 100644 index f2f961fa23..0000000000 --- a/webrtc/video_engine_tests.isolate +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', { - 'variables': { - 'files': [ - '<(DEPTH)/resources/foreman_cif_short.yuv', - '<(DEPTH)/resources/voice_engine/audio_long16.pcm', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/DEPS', - '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/video_engine_tests_apk.isolate b/webrtc/video_engine_tests_apk.isolate deleted file mode 100644 index 6f4c3d41cc..0000000000 --- a/webrtc/video_engine_tests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../build/android/android.isolate', - 'video_engine_tests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_video_engine_tests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../build/config/', - '../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/video_engine_tests_apk/', - '<(PRODUCT_DIR)/bin/run_video_engine_tests', - 'video_engine_tests.isolate', - ] - } -} diff --git a/webrtc/voice_engine/voe_auto_test.isolate b/webrtc/voice_engine/voe_auto_test.isolate deleted file mode 100644 index e89620dde0..0000000000 --- a/webrtc/voice_engine/voe_auto_test.isolate +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/voe_auto_test<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp index 1981ade16f..76061dd168 100644 --- a/webrtc/voice_engine/voice_engine.gyp +++ b/webrtc/voice_engine/voice_engine.gyp @@ -164,50 +164,6 @@ }], ], # conditions. }, - { - 'target_name': 'voice_engine_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'channel_transport', - 'voice_engine', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - # The rest are to satisfy the unittests' include chain. - # This would be unnecessary if we used qualified includes. - '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - '<(webrtc_root)/modules/modules.gyp:audio_device', - '<(webrtc_root)/modules/modules.gyp:audio_processing', - '<(webrtc_root)/modules/modules.gyp:audio_coding_module', - '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer', - '<(webrtc_root)/modules/modules.gyp:media_file', - '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', - '<(webrtc_root)/modules/modules.gyp:webrtc_utility', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/test/test.gyp:test_support_main', - ], - 'sources': [ - 'channel_unittest.cc', - 'network_predictor_unittest.cc', - 'test/channel_transport/udp_transport_unittest.cc', - 'test/channel_transport/udp_socket_manager_unittest.cc', - 'test/channel_transport/udp_socket_wrapper_unittest.cc', - 'transmit_mixer_unittest.cc', - 'utility_unittest.cc', - 'voe_audio_processing_unittest.cc', - 'voe_base_unittest.cc', - 'voe_codec_unittest.cc', - 'voe_network_unittest.cc', - 'voice_engine_fixture.cc', - 'voice_engine_fixture.h', - ], - 'conditions': [ - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - ], - }, { # command line test that should work on linux/mac/win 'target_name': 'voe_cmd_test', @@ -227,153 +183,6 @@ ], }, ], # targets - 'conditions': [ - ['OS!="ios"', { - 'targets': [ - { - 'target_name': 'voe_auto_test', - 'type': 'executable', - 'dependencies': [ - 'channel_transport', - '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:test_common', - '<(webrtc_root)/test/test.gyp:test_support', - '<(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': [ - { - 'target_name': 'voice_engine_unittests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):voice_engine_unittests_apk', - ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', - { - 'targets': [ - { - 'target_name': 'voice_engine_unittests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):voice_engine_unittests_apk', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'voice_engine_unittests_apk.isolate', - ], - }, - ], - }, - ], - ], - }], - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'voice_engine_unittests_run', - 'type': 'none', - 'dependencies': [ - 'voice_engine_unittests', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'voice_engine_unittests.isolate', - ], - }, - { - 'target_name': 'voe_auto_test_run', - 'type': 'none', - 'dependencies': [ - 'voe_auto_test', - ], - 'includes': [ - '../build/isolate.gypi', - ], - 'sources': [ - 'voe_auto_test.isolate', - ], - }, - ], - }], - ], # conditions }], # include_tests==1 ], # conditions } diff --git a/webrtc/voice_engine/voice_engine_unittests.isolate b/webrtc/voice_engine/voice_engine_unittests.isolate deleted file mode 100644 index 0d55515f99..0000000000 --- a/webrtc/voice_engine/voice_engine_unittests.isolate +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/testing/test_env.py', - '<(PRODUCT_DIR)/voice_engine_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/voice_engine/voice_engine_unittests_apk.isolate b/webrtc/voice_engine/voice_engine_unittests_apk.isolate deleted file mode 100644 index 6f0244c526..0000000000 --- a/webrtc/voice_engine/voice_engine_unittests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../../build/android/android.isolate', - 'voice_engine_unittests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_voice_engine_unittests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../../build/config/', - '../../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/voice_engine_unittests_apk/', - '<(PRODUCT_DIR)/bin/run_voice_engine_unittests', - 'voice_engine_unittests.isolate', - ] - } -} diff --git a/webrtc/webrtc_nonparallel_tests.isolate b/webrtc/webrtc_nonparallel_tests.isolate deleted file mode 100644 index 0e13d7b3ba..0000000000 --- a/webrtc/webrtc_nonparallel_tests.isolate +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/webrtc_nonparallel_tests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(PRODUCT_DIR)/webrtc_nonparallel_tests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/webrtc_nonparallel_tests_apk.isolate b/webrtc/webrtc_nonparallel_tests_apk.isolate deleted file mode 100644 index ee83d10814..0000000000 --- a/webrtc/webrtc_nonparallel_tests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../build/android/android.isolate', - 'webrtc_nonparallel_tests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_webrtc_nonparallel_tests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../build/config/', - '../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/webrtc_nonparallel_tests_apk/', - '<(PRODUCT_DIR)/bin/run_webrtc_nonparallel_tests', - 'webrtc_nonparallel_tests.isolate', - ] - }, -} diff --git a/webrtc/webrtc_perf_tests.isolate b/webrtc/webrtc_perf_tests.isolate deleted file mode 100644 index 7d58fd6a5d..0000000000 --- a/webrtc/webrtc_perf_tests.isolate +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win" or OS=="android"', { - 'variables': { - 'files': [ - '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm', - '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm', - '<(DEPTH)/resources/ConferenceMotion_1280_720_50.yuv', - '<(DEPTH)/resources/foreman_cif.yuv', - '<(DEPTH)/resources/paris_qcif.yuv', - '<(DEPTH)/resources/voice_engine/audio_long16.pcm', - '<(DEPTH)/resources/difficult_photo_1850_1110.yuv', - '<(DEPTH)/resources/photo_1850_1110.yuv', - '<(DEPTH)/resources/presentation_1850_1110.yuv', - '<(DEPTH)/resources/web_screenshot_1850_1110.yuv', - '<(DEPTH)/resources/google-wifi-3mbps.rx', - '<(DEPTH)/resources/verizon4g-downlink.rx', - ], - }, - }], - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/webrtc_perf_tests<(EXECUTABLE_SUFFIX)', - ], - 'files': [ - '<(DEPTH)/DEPS', - '<(PRODUCT_DIR)/webrtc_perf_tests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/webrtc/webrtc_perf_tests_apk.isolate b/webrtc/webrtc_perf_tests_apk.isolate deleted file mode 100644 index d1be691a0b..0000000000 --- a/webrtc/webrtc_perf_tests_apk.isolate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 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': [ - '../build/android/android.isolate', - 'webrtc_perf_tests.isolate', - ], - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/bin/run_webrtc_perf_tests', - '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats', - ], - 'files': [ - '../build/config/', - '../third_party/instrumented_libraries/instrumented_libraries.isolate', - '<(PRODUCT_DIR)/webrtc_perf_tests_apk/', - '<(PRODUCT_DIR)/bin/run_webrtc_perf_tests', - 'webrtc_perf_tests.isolate', - ] - }, -} diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index 5c4d62adb3..354476b883 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -7,247 +7,6 @@ # be found in the AUTHORS file in the root of the source tree. { 'targets': [ - { - 'target_name': 'rtc_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'base/base.gyp:rtc_base', - 'base/base.gyp:rtc_task_queue', - 'base/base_tests.gyp:rtc_base_tests_utils', - 'p2p/p2p.gyp:rtc_p2p', - 'p2p/p2p.gyp:libstunprober', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(DEPTH)/testing/gmock.gyp:gmock', - ], - 'sources': [ - 'base/array_view_unittest.cc', - 'base/atomicops_unittest.cc', - 'base/autodetectproxy_unittest.cc', - 'base/bandwidthsmoother_unittest.cc', - 'base/base64_unittest.cc', - 'base/basictypes_unittest.cc', - 'base/bind_unittest.cc', - 'base/bitbuffer_unittest.cc', - 'base/buffer_unittest.cc', - 'base/bufferqueue_unittest.cc', - 'base/bytebuffer_unittest.cc', - 'base/byteorder_unittest.cc', - 'base/callback_unittest.cc', - 'base/copyonwritebuffer_unittest.cc', - 'base/crc32_unittest.cc', - 'base/criticalsection_unittest.cc', - 'base/event_tracer_unittest.cc', - 'base/event_unittest.cc', - 'base/exp_filter_unittest.cc', - 'base/file_unittest.cc', - 'base/filerotatingstream_unittest.cc', - 'base/fileutils_unittest.cc', - 'base/helpers_unittest.cc', - 'base/httpbase_unittest.cc', - 'base/httpcommon_unittest.cc', - 'base/httpserver_unittest.cc', - 'base/ipaddress_unittest.cc', - 'base/logging_unittest.cc', - 'base/md5digest_unittest.cc', - 'base/messagedigest_unittest.cc', - 'base/messagequeue_unittest.cc', - 'base/mod_ops_unittest.cc', - 'base/multipart_unittest.cc', - 'base/nat_unittest.cc', - 'base/network_unittest.cc', - 'base/onetimeevent_unittest.cc', - 'base/optional_unittest.cc', - 'base/optionsfile_unittest.cc', - 'base/pathutils_unittest.cc', - 'base/platform_thread_unittest.cc', - 'base/profiler_unittest.cc', - 'base/proxy_unittest.cc', - 'base/proxydetect_unittest.cc', - 'base/random_unittest.cc', - 'base/rate_limiter_unittest.cc', - 'base/rate_statistics_unittest.cc', - 'base/ratelimiter_unittest.cc', - 'base/ratetracker_unittest.cc', - 'base/referencecountedsingletonfactory_unittest.cc', - 'base/rollingaccumulator_unittest.cc', - 'base/rtccertificate_unittest.cc', - 'base/rtccertificategenerator_unittest.cc', - 'base/scopedptrcollection_unittest.cc', - 'base/sequenced_task_checker_unittest.cc', - 'base/sha1digest_unittest.cc', - 'base/sharedexclusivelock_unittest.cc', - 'base/signalthread_unittest.cc', - 'base/sigslot_unittest.cc', - 'base/sigslottester.h', - 'base/sigslottester.h.pump', - 'base/stream_unittest.cc', - 'base/stringencode_unittest.cc', - 'base/stringutils_unittest.cc', - 'base/swap_queue_unittest.cc', - # TODO(ronghuawu): Reenable this test. - # 'systeminfo_unittest.cc', - 'base/task_queue_unittest.cc', - 'base/task_unittest.cc', - 'base/testclient_unittest.cc', - 'base/thread_checker_unittest.cc', - 'base/thread_unittest.cc', - 'base/timestampaligner_unittest.cc', - 'base/timeutils_unittest.cc', - 'base/urlencode_unittest.cc', - 'base/versionparsing_unittest.cc', - # TODO(ronghuawu): Reenable this test. - # 'windowpicker_unittest.cc', - 'p2p/base/dtlstransportchannel_unittest.cc', - 'p2p/base/fakeportallocator.h', - 'p2p/base/faketransportcontroller.h', - 'p2p/base/p2ptransportchannel_unittest.cc', - 'p2p/base/port_unittest.cc', - 'p2p/base/portallocator_unittest.cc', - 'p2p/base/pseudotcp_unittest.cc', - 'p2p/base/relayport_unittest.cc', - 'p2p/base/relayserver_unittest.cc', - 'p2p/base/stun_unittest.cc', - 'p2p/base/stunport_unittest.cc', - 'p2p/base/stunrequest_unittest.cc', - 'p2p/base/stunserver_unittest.cc', - 'p2p/base/testrelayserver.h', - 'p2p/base/teststunserver.h', - 'p2p/base/testturnserver.h', - 'p2p/base/transport_unittest.cc', - 'p2p/base/transportcontroller_unittest.cc', - 'p2p/base/transportdescriptionfactory_unittest.cc', - 'p2p/base/tcpport_unittest.cc', - 'p2p/base/turnport_unittest.cc', - 'p2p/base/turnserver_unittest.cc', - 'p2p/client/basicportallocator_unittest.cc', - 'p2p/stunprober/stunprober_unittest.cc', - ], - 'conditions': [ - ['OS=="linux"', { - 'sources': [ - 'base/latebindingsymboltable_unittest.cc', - # TODO(ronghuawu): Reenable this test. - # 'linux_unittest.cc', - 'base/linuxfdwalk_unittest.cc', - ], - }], - ['OS=="win"', { - 'sources': [ - 'base/win32_unittest.cc', - 'base/win32regkey_unittest.cc', - 'base/win32window_unittest.cc', - 'base/win32windowpicker_unittest.cc', - 'base/winfirewall_unittest.cc', - ], - }], - ['OS=="win" and clang==1', { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'AdditionalOptions': [ - # Disable warnings failing when compiling with Clang on Windows. - # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 - '-Wno-missing-braces', - '-Wno-sign-compare', - '-Wno-unused-const-variable', - ], - }, - }, - }], - ['OS=="mac"', { - 'sources': [ - 'base/macutils_unittest.cc', - ], - }], - ['os_posix==1', { - 'sources': [ - 'base/ssladapter_unittest.cc', - 'base/sslidentity_unittest.cc', - 'base/sslstreamadapter_unittest.cc', - ], - }], - ['use_quic==1', { - 'sources': [ - 'p2p/quic/quicconnectionhelper_unittest.cc', - 'p2p/quic/quicsession_unittest.cc', - 'p2p/quic/quictransport_unittest.cc', - 'p2p/quic/quictransportchannel_unittest.cc', - 'p2p/quic/reliablequicstream_unittest.cc', - ], - }], - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - ['OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7")', { - 'includes': [ - 'build/objc_common.gypi', - ], - 'dependencies': [ - 'sdk/sdk.gyp:rtc_sdk_peerconnection_objc', - 'system_wrappers/system_wrappers.gyp:metrics_default', - ], - 'sources': [ - 'sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm', - 'sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm', - 'sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm', - 'sdk/objc/Framework/UnitTests/RTCIceServerTest.mm', - 'sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm', - 'sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm', - ], - 'xcode_settings': { - # |-ObjC| flag needed to make sure category method implementations - # are included: - # https://developer.apple.com/library/mac/qa/qa1490/_index.html - 'OTHER_LDFLAGS': ['-ObjC'], - }, - }], - ], - }, - { - 'target_name': 'xmllite_xmpp_unittests', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'base/base_tests.gyp:rtc_base_tests_utils', # needed for main() - 'libjingle/xmllite/xmllite.gyp:rtc_xmllite', - 'libjingle/xmpp/xmpp.gyp:rtc_xmpp', - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - 'libjingle/xmllite/qname_unittest.cc', - 'libjingle/xmllite/xmlbuilder_unittest.cc', - 'libjingle/xmllite/xmlelement_unittest.cc', - 'libjingle/xmllite/xmlnsstack_unittest.cc', - 'libjingle/xmllite/xmlparser_unittest.cc', - 'libjingle/xmllite/xmlprinter_unittest.cc', - 'libjingle/xmpp/fakexmppclient.h', - 'libjingle/xmpp/hangoutpubsubclient_unittest.cc', - 'libjingle/xmpp/jid_unittest.cc', - 'libjingle/xmpp/mucroomconfigtask_unittest.cc', - 'libjingle/xmpp/mucroomdiscoverytask_unittest.cc', - 'libjingle/xmpp/mucroomlookuptask_unittest.cc', - 'libjingle/xmpp/mucroomuniquehangoutidtask_unittest.cc', - 'libjingle/xmpp/pingtask_unittest.cc', - 'libjingle/xmpp/pubsubclient_unittest.cc', - 'libjingle/xmpp/pubsubtasks_unittest.cc', - 'libjingle/xmpp/util_unittest.cc', - 'libjingle/xmpp/util_unittest.h', - 'libjingle/xmpp/xmppengine_unittest.cc', - 'libjingle/xmpp/xmpplogintask_unittest.cc', - 'libjingle/xmpp/xmppstanzaparser_unittest.cc', - ], - }, - { - 'target_name': 'webrtc_tests', - 'type': 'none', - 'dependencies': [ - 'video_engine_tests', - 'video_loopback', - 'video_replay', - 'webrtc_perf_tests', - 'webrtc_nonparallel_tests', - ], - }, { 'target_name': 'video_quality_test', 'type': 'static_library', @@ -269,34 +28,6 @@ }], ], }, - { - 'target_name': 'video_loopback', - 'type': 'executable', - 'sources': [ - 'test/run_test.h', - 'video/video_loopback.cc', - ], - 'conditions': [ - ['OS=="mac"', { - 'sources': [ - 'test/mac/run_test.mm', - ], - }, { - 'sources': [ - 'test/run_test.cc', - ], - }], - ], - 'dependencies': [ - 'video_quality_test', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default', - 'test/test.gyp:field_trial', - 'test/test.gyp:test_common', - 'test/test.gyp:test_renderer', - ], - }, { 'target_name': 'screenshare_loopback', 'type': 'executable', @@ -349,317 +80,5 @@ 'webrtc', ], }, - { - # TODO(solenberg): Rename to webrtc_call_tests. - 'target_name': 'video_engine_tests', - 'type': '<(gtest_target_type)', - 'sources': [ - 'audio/audio_receive_stream_unittest.cc', - 'audio/audio_send_stream_unittest.cc', - 'audio/audio_state_unittest.cc', - 'call/bitrate_allocator_unittest.cc', - 'call/bitrate_estimator_tests.cc', - 'call/call_unittest.cc', - 'call/packet_injection_tests.cc', - 'call/ringbuffer_unittest.cc', - 'video/call_stats_unittest.cc', - 'video/encoder_state_feedback_unittest.cc', - 'video/end_to_end_tests.cc', - 'video/overuse_frame_detector_unittest.cc', - 'video/payload_router_unittest.cc', - 'video/report_block_stats_unittest.cc', - 'video/send_delay_stats_unittest.cc', - 'video/send_statistics_proxy_unittest.cc', - 'video/stats_counter_unittest.cc', - 'video/stream_synchronization_unittest.cc', - 'video/video_decoder_unittest.cc', - 'video/video_encoder_unittest.cc', - 'video/video_send_stream_tests.cc', - 'video/vie_encoder_unittest.cc', - 'video/vie_remb_unittest.cc', - ], - 'dependencies': [ - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/api/api.gyp:call_api', - '<(webrtc_root)/common.gyp:webrtc_common', - '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', - '<(webrtc_root)/modules/modules.gyp:video_capture', - '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', - 'test/test.gyp:test_common', - 'test/test.gyp:test_main', - 'test/test.gyp:test_support', - 'webrtc', - ], - 'conditions': [ - ['rtc_use_h264==1', { - 'defines': [ - 'WEBRTC_END_TO_END_H264_TESTS', - ], - }], - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - ['OS=="ios"', { - 'mac_bundle_resources': [ - '<(DEPTH)/resources/foreman_cif_short.yuv', - '<(DEPTH)/resources/voice_engine/audio_long16.pcm', - ], - }], - ['enable_protobuf==1', { - 'defines': [ - 'ENABLE_RTC_EVENT_LOG', - ], - 'dependencies': [ - 'webrtc.gyp:rtc_event_log', - 'webrtc.gyp:rtc_event_log_parser', - 'webrtc.gyp:rtc_event_log_proto', - ], - 'sources': [ - 'call/rtc_event_log_unittest.cc', - 'call/rtc_event_log_unittest_helper.cc' - ], - }], - ], - }, - { - 'target_name': 'webrtc_perf_tests', - 'type': '<(gtest_target_type)', - 'sources': [ - 'call/call_perf_tests.cc', - 'call/rampup_tests.cc', - 'call/rampup_tests.h', - 'modules/audio_coding/neteq/test/neteq_performance_unittest.cc', - 'modules/audio_processing/audio_processing_performance_unittest.cc', - 'modules/audio_processing/level_controller/level_controller_complexity_unittest.cc', - 'modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc', - 'video/full_stack.cc', - ], - 'dependencies': [ - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/modules/modules.gyp:audio_processing', - '<(webrtc_root)/modules/modules.gyp:audioproc_test_utils', - '<(webrtc_root)/modules/modules.gyp:video_capture', - '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', - 'video_quality_test', - 'modules/modules.gyp:neteq_test_support', - 'modules/modules.gyp:bwe_simulator', - 'modules/modules.gyp:rtp_rtcp', - 'test/test.gyp:test_common', - 'test/test.gyp:test_main', - 'test/test.gyp:test_renderer', - 'webrtc', - ], - 'conditions': [ - ['enable_intelligibility_enhancer==1', { - 'defines': ['WEBRTC_INTELLIGIBILITY_ENHANCER=1',], - }, { - 'defines': ['WEBRTC_INTELLIGIBILITY_ENHANCER=0',], - }], - - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - ], - }, - { - 'target_name': 'webrtc_nonparallel_tests', - 'type': '<(gtest_target_type)', - 'sources': [ - 'base/nullsocketserver_unittest.cc', - 'base/physicalsocketserver_unittest.cc', - 'base/socket_unittest.cc', - 'base/socket_unittest.h', - 'base/socketaddress_unittest.cc', - 'base/virtualsocket_unittest.cc', - ], - 'defines': [ - 'GTEST_RELATIVE_PATH', - ], - 'dependencies': [ - '<(DEPTH)/testing/gtest.gyp:gtest', - 'base/base.gyp:rtc_base', - 'test/test.gyp:test_main', - ], - 'conditions': [ - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - ['OS=="win"', { - 'sources': [ - 'base/win32socketserver_unittest.cc', - ], - }], - ['OS=="mac"', { - 'sources': [ - 'base/macsocketserver_unittest.cc', - ], - }], - ], - }, - ], - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'rtc_unittests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):rtc_unittests_apk', - ], - }, - { - 'target_name': 'video_engine_tests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):video_engine_tests_apk', - ], - }, - { - 'target_name': 'webrtc_perf_tests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):webrtc_perf_tests_apk', - ], - }, - { - 'target_name': 'webrtc_nonparallel_tests_apk_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):webrtc_nonparallel_tests_apk', - ], - }, - { - 'target_name': 'android_junit_tests_target', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):android_junit_tests', - ], - }, - ], - 'conditions': [ - ['test_isolation_mode != "noop"', - { - 'targets': [ - { - 'target_name': 'rtc_unittests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):rtc_unittests_apk', - ], - 'includes': [ - 'build/isolate.gypi', - ], - 'sources': [ - 'rtc_unittests_apk.isolate', - ], - }, - { - 'target_name': 'video_engine_tests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):video_engine_tests_apk', - ], - 'includes': [ - 'build/isolate.gypi', - ], - 'sources': [ - 'video_engine_tests_apk.isolate', - ], - }, - { - 'target_name': 'webrtc_perf_tests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):webrtc_perf_tests_apk', - ], - 'includes': [ - 'build/isolate.gypi', - ], - 'sources': [ - 'webrtc_perf_tests_apk.isolate', - ], - }, - { - 'target_name': 'webrtc_nonparallel_tests_apk_run', - 'type': 'none', - 'dependencies': [ - '<(android_tests_path):webrtc_nonparallel_tests_apk', - ], - 'includes': [ - 'build/isolate.gypi', - ], - 'sources': [ - 'webrtc_nonparallel_tests_apk.isolate', - ], - }, - ], - }, - ], - ], - }], - ['test_isolation_mode != "noop"', { - 'targets': [ - { - 'target_name': 'rtc_unittests_run', - 'type': 'none', - 'dependencies': [ - 'rtc_unittests', - ], - 'includes': [ - 'build/isolate.gypi', - ], - 'sources': [ - 'rtc_unittests.isolate', - ], - }, - { - 'target_name': 'video_engine_tests_run', - 'type': 'none', - 'dependencies': [ - 'video_engine_tests', - ], - 'includes': [ - 'build/isolate.gypi', - ], - 'sources': [ - 'video_engine_tests.isolate', - ], - }, - { - 'target_name': 'webrtc_nonparallel_tests_run', - 'type': 'none', - 'dependencies': [ - 'webrtc_nonparallel_tests', - ], - 'includes': [ - 'build/isolate.gypi', - ], - 'sources': [ - 'webrtc_nonparallel_tests.isolate', - ], - }, - { - 'target_name': 'webrtc_perf_tests_run', - 'type': 'none', - 'dependencies': [ - 'webrtc_perf_tests', - ], - 'includes': [ - 'build/isolate.gypi', - ], - 'sources': [ - 'webrtc_perf_tests.isolate', - ], - }, - ], - }], ], }