Remove webrtc/test/webrtc_test_common.gyp
Move the "webrtc_test_common" target to test.gyp and rename
it to "test_common".
Move all tests in "webrtc_test_common_unittests" (which
wasn't run on the bots) into "test_support_unittests".
NOTRY=True
NOPRESUBMIT=True
Review URL: https://codereview.webrtc.org/1754593002
Cr-Commit-Position: refs/heads/master@{#11848}
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 8d927b0..18c8b4a 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -163,7 +163,7 @@
'<(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/webrtc_test_common.gyp:webrtc_test_common',
+ '<(webrtc_root)/test/test.gyp:test_common',
'<(webrtc_root)/tools/tools.gyp:agc_test_utils',
],
'sources': [
diff --git a/webrtc/modules/modules_unittests.isolate b/webrtc/modules/modules_unittests.isolate
index cbef944..a7fc4e8 100644
--- a/webrtc/modules/modules_unittests.isolate
+++ b/webrtc/modules/modules_unittests.isolate
@@ -129,11 +129,6 @@
'<(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',
],
},
}],
diff --git a/webrtc/modules/video_coding/video_coding_test.gypi b/webrtc/modules/video_coding/video_coding_test.gypi
index fc2fec6..8f7bc03 100644
--- a/webrtc/modules/video_coding/video_coding_test.gypi
+++ b/webrtc/modules/video_coding/video_coding_test.gypi
@@ -15,7 +15,7 @@
'webrtc_video_coding',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
- '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common',
+ '<(webrtc_root)/test/test.gyp:test_common',
],
'sources': [
# headers
diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp
index 32c5dc8..ee3283e 100644
--- a/webrtc/test/test.gyp
+++ b/webrtc/test/test.gyp
@@ -212,11 +212,17 @@
'type': '<(gtest_target_type)',
'dependencies': [
'channel_transport',
+ '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',
'channel_transport/udp_transport_unittest.cc',
'channel_transport/udp_socket_manager_unittest.cc',
'channel_transport/udp_socket_wrapper_unittest.cc',
@@ -240,6 +246,159 @@
}],
],
},
+ {
+ 'target_name': 'test_common',
+ 'type': 'static_library',
+ 'sources': [
+ 'call_test.cc',
+ 'call_test.h',
+ 'configurable_frame_size_encoder.cc',
+ 'configurable_frame_size_encoder.h',
+ 'constants.cc',
+ 'constants.h',
+ 'direct_transport.cc',
+ 'direct_transport.h',
+ 'drifting_clock.cc',
+ 'drifting_clock.h',
+ 'encoder_settings.cc',
+ 'encoder_settings.h',
+ 'fake_audio_device.cc',
+ 'fake_audio_device.h',
+ 'fake_decoder.cc',
+ 'fake_decoder.h',
+ 'fake_encoder.cc',
+ 'fake_encoder.h',
+ 'fake_network_pipe.cc',
+ 'fake_network_pipe.h',
+ 'frame_generator_capturer.cc',
+ 'frame_generator_capturer.h',
+ 'layer_filtering_transport.cc',
+ 'layer_filtering_transport.h',
+ 'mock_transport.h',
+ 'mock_voe_channel_proxy.h',
+ 'mock_voice_engine.h',
+ 'null_transport.cc',
+ 'null_transport.h',
+ 'rtp_rtcp_observer.h',
+ 'run_loop.cc',
+ 'run_loop.h',
+ 'statistics.cc',
+ 'statistics.h',
+ 'vcm_capturer.cc',
+ 'vcm_capturer.h',
+ 'video_capturer.cc',
+ 'video_capturer.h',
+ 'win/run_loop_win.cc',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'sources!': [
+ 'run_loop.cc',
+ ],
+ }],
+ ],
+ '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',
+ '<(webrtc_root)/common.gyp:webrtc_common',
+ '<(webrtc_root)/modules/modules.gyp:media_file',
+ '<(webrtc_root)/modules/modules.gyp:video_render',
+ '<(webrtc_root)/webrtc.gyp:webrtc',
+ 'rtp_test_utils',
+ 'test_support',
+ 'video_test_common',
+ ],
+ },
+ {
+ 'target_name': 'test_renderer',
+ 'type': 'static_library',
+ 'sources': [
+ 'gl/gl_renderer.cc',
+ 'gl/gl_renderer.h',
+ 'linux/glx_renderer.cc',
+ 'linux/glx_renderer.h',
+ 'linux/video_renderer_linux.cc',
+ 'mac/video_renderer_mac.h',
+ 'mac/video_renderer_mac.mm',
+ 'null_platform_renderer.cc',
+ 'video_renderer.cc',
+ 'video_renderer.h',
+ 'win/d3d_renderer.cc',
+ 'win/d3d_renderer.h',
+ ],
+ 'conditions': [
+ ['OS=="linux"', {
+ 'sources!': [
+ 'null_platform_renderer.cc',
+ ],
+ }],
+ ['OS=="mac"', {
+ 'sources!': [
+ 'null_platform_renderer.cc',
+ ],
+ }],
+ ['OS!="linux" and OS!="mac"', {
+ 'sources!' : [
+ 'gl/gl_renderer.cc',
+ 'gl/gl_renderer.h',
+ ],
+ }],
+ ['OS=="win"', {
+ 'sources!': [
+ 'null_platform_renderer.cc',
+ ],
+ 'include_dirs': [
+ '<(directx_sdk_path)/Include',
+ ],
+ }],
+ ['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-bool-conversion',
+ '-Wno-comment',
+ '-Wno-delete-non-virtual-dtor',
+ ],
+ },
+ },
+ }],
+ ],
+ 'dependencies': [
+ '<(DEPTH)/testing/gtest.gyp:gtest',
+ '<(webrtc_root)/modules/modules.gyp:media_file',
+ 'test_support',
+ 'video_test_common',
+ ],
+ 'direct_dependent_settings': {
+ 'conditions': [
+ ['OS=="linux"', {
+ 'libraries': [
+ '-lXext',
+ '-lX11',
+ '-lGL',
+ ],
+ }],
+ ['OS=="android"', {
+ 'libraries' : [
+ '-lGLESv2', '-llog',
+ ],
+ }],
+ ['OS=="mac"', {
+ 'xcode_settings' : {
+ 'OTHER_LDFLAGS' : [
+ '-framework Cocoa',
+ '-framework OpenGL',
+ '-framework CoreVideo',
+ ],
+ },
+ }],
+ ],
+ },
+ },
],
'conditions': [
['include_tests==1 and OS=="android"', {
diff --git a/webrtc/test/test_support_unittests.isolate b/webrtc/test/test_support_unittests.isolate
index 3fd89d6..32df039 100644
--- a/webrtc/test/test_support_unittests.isolate
+++ b/webrtc/test/test_support_unittests.isolate
@@ -7,6 +7,18 @@
# 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/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': [
diff --git a/webrtc/test/webrtc_test_common.gyp b/webrtc/test/webrtc_test_common.gyp
deleted file mode 100644
index 46f5f65..0000000
--- a/webrtc/test/webrtc_test_common.gyp
+++ /dev/null
@@ -1,190 +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': 'webrtc_test_common',
- 'type': 'static_library',
- 'sources': [
- 'call_test.cc',
- 'call_test.h',
- 'configurable_frame_size_encoder.cc',
- 'configurable_frame_size_encoder.h',
- 'constants.cc',
- 'constants.h',
- 'direct_transport.cc',
- 'direct_transport.h',
- 'drifting_clock.cc',
- 'drifting_clock.h',
- 'encoder_settings.cc',
- 'encoder_settings.h',
- 'fake_audio_device.cc',
- 'fake_audio_device.h',
- 'fake_decoder.cc',
- 'fake_decoder.h',
- 'fake_encoder.cc',
- 'fake_encoder.h',
- 'fake_network_pipe.cc',
- 'fake_network_pipe.h',
- 'frame_generator_capturer.cc',
- 'frame_generator_capturer.h',
- 'layer_filtering_transport.cc',
- 'layer_filtering_transport.h',
- 'mock_transport.h',
- 'mock_voe_channel_proxy.h',
- 'mock_voice_engine.h',
- 'null_transport.cc',
- 'null_transport.h',
- 'rtp_rtcp_observer.h',
- 'run_loop.cc',
- 'run_loop.h',
- 'statistics.cc',
- 'statistics.h',
- 'vcm_capturer.cc',
- 'vcm_capturer.h',
- 'video_capturer.cc',
- 'video_capturer.h',
- 'win/run_loop_win.cc',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'sources!': [
- 'run_loop.cc',
- ],
- }],
- ],
- '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',
- '<(webrtc_root)/common.gyp:webrtc_common',
- '<(webrtc_root)/modules/modules.gyp:media_file',
- '<(webrtc_root)/modules/modules.gyp:video_render',
- '<(webrtc_root)/test/test.gyp:video_test_common',
- '<(webrtc_root)/test/test.gyp:test_support',
- '<(webrtc_root)/test/test.gyp:rtp_test_utils',
- '<(webrtc_root)/webrtc.gyp:webrtc',
- ],
- },
- {
- 'target_name': 'webrtc_test_renderer',
- 'type': 'static_library',
- 'sources': [
- 'gl/gl_renderer.cc',
- 'gl/gl_renderer.h',
- 'linux/glx_renderer.cc',
- 'linux/glx_renderer.h',
- 'linux/video_renderer_linux.cc',
- 'mac/video_renderer_mac.h',
- 'mac/video_renderer_mac.mm',
- 'null_platform_renderer.cc',
- 'video_renderer.cc',
- 'video_renderer.h',
- 'win/d3d_renderer.cc',
- 'win/d3d_renderer.h',
- ],
- 'conditions': [
- ['OS=="linux"', {
- 'sources!': [
- 'null_platform_renderer.cc',
- ],
- }],
- ['OS=="mac"', {
- 'sources!': [
- 'null_platform_renderer.cc',
- ],
- }],
- ['OS!="linux" and OS!="mac"', {
- 'sources!' : [
- 'gl/gl_renderer.cc',
- 'gl/gl_renderer.h',
- ],
- }],
- ['OS=="win"', {
- 'sources!': [
- 'null_platform_renderer.cc',
- ],
- 'include_dirs': [
- '<(directx_sdk_path)/Include',
- ],
- }],
- ['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-bool-conversion',
- '-Wno-comment',
- '-Wno-delete-non-virtual-dtor',
- ],
- },
- },
- }],
- ],
- 'dependencies': [
- '<(DEPTH)/testing/gtest.gyp:gtest',
- '<(webrtc_root)/modules/modules.gyp:media_file',
- '<(webrtc_root)/test/test.gyp:video_test_common',
- '<(webrtc_root)/test/test.gyp:test_support',
- ],
- 'direct_dependent_settings': {
- 'conditions': [
- ['OS=="linux"', {
- 'libraries': [
- '-lXext',
- '-lX11',
- '-lGL',
- ],
- }],
- ['OS=="android"', {
- 'libraries' : [
- '-lGLESv2', '-llog',
- ],
- }],
- ['OS=="mac"', {
- 'xcode_settings' : {
- 'OTHER_LDFLAGS' : [
- '-framework Cocoa',
- '-framework OpenGL',
- '-framework CoreVideo',
- ],
- },
- }],
- ],
- },
- },
- ],
- 'conditions': [
- ['include_tests==1', {
- 'targets': [
- {
- 'target_name': 'webrtc_test_common_unittests',
- 'type': '<(gtest_target_type)',
- 'dependencies': [
- 'webrtc_test_common',
- '<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/testing/gmock.gyp:gmock',
- '<(webrtc_root)/modules/modules.gyp:video_capture',
- '<(webrtc_root)/test/test.gyp:test_support_main',
- ],
- 'sources': [
- 'fake_network_pipe_unittest.cc',
- 'frame_generator_unittest.cc',
- 'rtp_file_reader_unittest.cc',
- 'rtp_file_writer_unittest.cc',
- ],
- },
- ], #targets
- }], # include_tests
- ], # conditions
-}
diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp
index cff2d8f..7078bdf 100644
--- a/webrtc/voice_engine/voice_engine.gyp
+++ b/webrtc/voice_engine/voice_engine.gyp
@@ -182,8 +182,8 @@
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
'<(webrtc_root)/test/test.gyp:channel_transport',
+ '<(webrtc_root)/test/test.gyp:test_common',
'<(webrtc_root)/test/test.gyp:test_support',
- '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common',
'<(webrtc_root)/webrtc.gyp:rtc_event_log',
],
'sources': [
diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp
index 1adae73..d560cad 100644
--- a/webrtc/webrtc.gyp
+++ b/webrtc/webrtc.gyp
@@ -100,7 +100,6 @@
'system_wrappers/system_wrappers_tests.gyp:*',
'test/metrics.gyp:*',
'test/test.gyp:*',
- 'test/webrtc_test_common.gyp:*',
'webrtc_tests',
],
}],
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index 3563fee..addf147 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -92,9 +92,9 @@
'video_quality_test',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
- 'test/webrtc_test_common.gyp:webrtc_test_common',
- 'test/webrtc_test_common.gyp:webrtc_test_renderer',
+ 'test/test.gyp:test_common',
'test/test.gyp:test_main',
+ 'test/test.gyp:test_renderer',
'webrtc',
],
},
@@ -118,9 +118,9 @@
'video_quality_test',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
- 'test/webrtc_test_common.gyp:webrtc_test_common',
- 'test/webrtc_test_common.gyp:webrtc_test_renderer',
+ 'test/test.gyp:test_common',
'test/test.gyp:test_main',
+ 'test/test.gyp:test_renderer',
'webrtc',
],
},
@@ -143,8 +143,8 @@
'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
- 'test/webrtc_test_common.gyp:webrtc_test_common',
- 'test/webrtc_test_common.gyp:webrtc_test_renderer',
+ 'test/test.gyp:test_common',
+ 'test/test.gyp:test_renderer',
'<(webrtc_root)/modules/modules.gyp:video_capture',
'<(webrtc_root)/modules/modules.gyp:video_render',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
@@ -189,8 +189,8 @@
'<(webrtc_root)/test/test.gyp:channel_transport',
'<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
'test/metrics.gyp:metrics',
+ 'test/test.gyp:test_common',
'test/test.gyp:test_main',
- 'test/webrtc_test_common.gyp:webrtc_test_common',
'webrtc',
],
'conditions': [
@@ -248,9 +248,9 @@
'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/webrtc_test_common.gyp:webrtc_test_common',
- 'test/webrtc_test_common.gyp:webrtc_test_renderer',
+ 'test/test.gyp:test_renderer',
'webrtc',
],
'conditions': [
