From 07d9e545ff9f3084973d184d714cc8d5d82f1c5b Mon Sep 17 00:00:00 2001 From: solenberg Date: Tue, 13 Sep 2016 01:24:03 -0700 Subject: [PATCH] Revert of Moved webrtc/test/channel_transport/ into webrtc/voice_engine/test/ (patchset #7 id:120001 of https://codereview.webrtc.org/2319583005/ ) Reason for revert: Breaks downstream code Original issue's description: > Moved webrtc/test/channel_transport/ into webrtc/voice_engine/test/ > > Only used in VoE tests so I'm moving it in under voice_engine/ until we've removed its usage and can deprecate. > > Note: submitting this with PRESUBMIT=false because the files do not adhere to style guide conventions and I'd rather change that in a separate CL. > > BUG= > NOPRESUBMIT=true > > Committed: https://crrev.com/ade2a038a9290ee0c85d8c682eba5447aca943cd > Cr-Commit-Position: refs/heads/master@{#14191} TBR=kwiberg@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review-Url: https://codereview.webrtc.org/2336123002 Cr-Commit-Position: refs/heads/master@{#14193} --- webrtc/BUILD.gn | 1 + webrtc/test/BUILD.gn | 66 ++++++++++++++++++ webrtc/test/channel_transport/OWNERS | 1 + .../channel_transport/channel_transport.cc | 4 +- .../channel_transport/channel_transport.h | 8 +-- .../channel_transport/traffic_control_win.cc | 2 +- .../channel_transport/traffic_control_win.h | 6 +- .../udp_socket2_manager_win.cc | 4 +- .../udp_socket2_manager_win.h | 12 ++-- .../test/channel_transport/udp_socket2_win.cc | 6 +- .../test/channel_transport/udp_socket2_win.h | 10 +-- .../udp_socket_manager_posix.cc | 4 +- .../udp_socket_manager_posix.h | 10 +-- .../udp_socket_manager_unittest.cc | 4 +- .../udp_socket_manager_wrapper.cc | 6 +- .../udp_socket_manager_wrapper.h | 6 +- .../channel_transport/udp_socket_posix.cc | 6 +- .../test/channel_transport/udp_socket_posix.h | 8 +-- .../channel_transport/udp_socket_wrapper.cc | 8 +-- .../channel_transport/udp_socket_wrapper.h | 8 +-- .../udp_socket_wrapper_unittest.cc | 4 +- .../test/channel_transport/udp_transport.h | 6 +- .../channel_transport/udp_transport_impl.cc | 4 +- .../channel_transport/udp_transport_impl.h | 10 +-- .../udp_transport_unittest.cc | 10 +-- webrtc/test/test.gyp | 53 +++++++++++++++ webrtc/voice_engine/BUILD.gn | 67 +------------------ .../test/auto_test/voe_cpu_test.cc | 2 +- .../test/auto_test/voe_output_test.cc | 2 +- .../test/auto_test/voe_stress_test.cc | 2 +- .../test/cmd_test/voe_cmd_test.cc | 2 +- webrtc/voice_engine/voice_engine.gyp | 60 +---------------- webrtc/webrtc_tests.gypi | 2 + 33 files changed, 204 insertions(+), 200 deletions(-) create mode 100644 webrtc/test/channel_transport/OWNERS rename webrtc/{voice_engine => }/test/channel_transport/channel_transport.cc (94%) rename webrtc/{voice_engine => }/test/channel_transport/channel_transport.h (84%) rename webrtc/{voice_engine => }/test/channel_transport/traffic_control_win.cc (99%) rename webrtc/{voice_engine => }/test/channel_transport/traffic_control_win.h (92%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket2_manager_win.cc (99%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket2_manager_win.h (89%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket2_win.cc (99%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket2_win.h (93%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket_manager_posix.cc (98%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket_manager_posix.h (83%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket_manager_unittest.cc (95%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket_manager_wrapper.cc (87%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket_manager_wrapper.h (88%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket_posix.cc (96%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket_posix.h (89%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket_wrapper.cc (92%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket_wrapper.h (91%) rename webrtc/{voice_engine => }/test/channel_transport/udp_socket_wrapper_unittest.cc (93%) rename webrtc/{voice_engine => }/test/channel_transport/udp_transport.h (98%) rename webrtc/{voice_engine => }/test/channel_transport/udp_transport_impl.cc (99%) rename webrtc/{voice_engine => }/test/channel_transport/udp_transport_impl.h (96%) rename webrtc/{voice_engine => }/test/channel_transport/udp_transport_unittest.cc (94%) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 702d30dce6..c33055ce76 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -771,6 +771,7 @@ if (rtc_include_tests) { "modules/audio_processing:audioproc_test_utils", "modules/remote_bitrate_estimator:bwe_simulator", "modules/rtp_rtcp", + "test:channel_transport", "test:test_common", "test:test_main", "test:test_renderer", diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn index 13b98402a7..69914494bf 100644 --- a/webrtc/test/BUILD.gn +++ b/webrtc/test/BUILD.gn @@ -16,6 +16,7 @@ rtc_source_set("test") { testonly = true deps = [ + ":channel_transport", ":field_trial", ":rtp_test_utils", ":test_common", @@ -27,6 +28,67 @@ rtc_source_set("test") { ] } +config("channel_transport_warnings_config") { + if (is_win) { + cflags = [ "/wd4302" ] # cast truncation + + if (is_clang) { + # GN orders flags on a target before flags from configs. The default + # config adds -Wall, and this flag have to be after -Wall -- so they need + # to come from a config and cannot be on the target directly. + cflags += [ + "-Wno-parentheses-equality", + "-Wno-reorder", + "-Wno-tautological-constant-out-of-range-compare", + + # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6268 + # for -Wno-thread-safety-analysis + "-Wno-thread-safety-analysis", + "-Wno-unused-private-field", + ] + } + } +} + +rtc_source_set("channel_transport") { + testonly = true + sources = [ + "channel_transport/channel_transport.cc", + "channel_transport/channel_transport.h", + "channel_transport/traffic_control_win.cc", + "channel_transport/traffic_control_win.h", + "channel_transport/udp_socket2_manager_win.cc", + "channel_transport/udp_socket2_manager_win.h", + "channel_transport/udp_socket2_win.cc", + "channel_transport/udp_socket2_win.h", + "channel_transport/udp_socket_manager_posix.cc", + "channel_transport/udp_socket_manager_posix.h", + "channel_transport/udp_socket_manager_wrapper.cc", + "channel_transport/udp_socket_manager_wrapper.h", + "channel_transport/udp_socket_posix.cc", + "channel_transport/udp_socket_posix.h", + "channel_transport/udp_socket_wrapper.cc", + "channel_transport/udp_socket_wrapper.h", + "channel_transport/udp_transport.h", + "channel_transport/udp_transport_impl.cc", + "channel_transport/udp_transport_impl.h", + ] + + configs += [ ":channel_transport_warnings_config" ] + + if (is_clang && !is_nacl) { + # Suppress warnings from the Chromium Clang plugin. + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. + suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] + } + + deps = [ + "..:webrtc_common", + "../system_wrappers", + "//testing/gtest", + ] +} + rtc_source_set("video_test_common") { testonly = true sources = [ @@ -217,6 +279,9 @@ if (is_ios) { rtc_test("test_support_unittests") { deps = [] sources = [ + "channel_transport/udp_socket_manager_unittest.cc", + "channel_transport/udp_socket_wrapper_unittest.cc", + "channel_transport/udp_transport_unittest.cc", "fake_network_pipe_unittest.cc", "frame_generator_unittest.cc", "rtp_file_reader_unittest.cc", @@ -255,6 +320,7 @@ rtc_test("test_support_unittests") { } deps += [ + ":channel_transport", ":test_common", ":test_support_main", "../modules/video_capture", diff --git a/webrtc/test/channel_transport/OWNERS b/webrtc/test/channel_transport/OWNERS new file mode 100644 index 0000000000..c33ba7023a --- /dev/null +++ b/webrtc/test/channel_transport/OWNERS @@ -0,0 +1 @@ +solenberg@webrtc.org diff --git a/webrtc/voice_engine/test/channel_transport/channel_transport.cc b/webrtc/test/channel_transport/channel_transport.cc similarity index 94% rename from webrtc/voice_engine/test/channel_transport/channel_transport.cc rename to webrtc/test/channel_transport/channel_transport.cc index 785f65b865..38eefe54a2 100644 --- a/webrtc/voice_engine/test/channel_transport/channel_transport.cc +++ b/webrtc/test/channel_transport/channel_transport.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/channel_transport/channel_transport.h" +#include "webrtc/test/channel_transport/channel_transport.h" #include #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) #include "testing/gtest/include/gtest/gtest.h" #endif -#include "webrtc/voice_engine/test/channel_transport/udp_transport.h" +#include "webrtc/test/channel_transport/udp_transport.h" #include "webrtc/voice_engine/include/voe_network.h" #if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS) diff --git a/webrtc/voice_engine/test/channel_transport/channel_transport.h b/webrtc/test/channel_transport/channel_transport.h similarity index 84% rename from webrtc/voice_engine/test/channel_transport/channel_transport.h rename to webrtc/test/channel_transport/channel_transport.h index 9604b512de..bab7c59181 100644 --- a/webrtc/voice_engine/test/channel_transport/channel_transport.h +++ b/webrtc/test/channel_transport/channel_transport.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_CHANNEL_TRANSPORT_H_ -#define WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_CHANNEL_TRANSPORT_H_ +#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_CHANNEL_TRANSPORT_H_ +#define WEBRTC_TEST_CHANNEL_TRANSPORT_CHANNEL_TRANSPORT_H_ -#include "webrtc/voice_engine/test/channel_transport/udp_transport.h" +#include "webrtc/test/channel_transport/udp_transport.h" namespace webrtc { @@ -53,4 +53,4 @@ class VoiceChannelTransport : public UdpTransportData { } // namespace test } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_CHANNEL_TRANSPORT_H_ +#endif // WEBRTC_TEST_CHANNEL_TRANSPORT_CHANNEL_TRANSPORT_H_ diff --git a/webrtc/voice_engine/test/channel_transport/traffic_control_win.cc b/webrtc/test/channel_transport/traffic_control_win.cc similarity index 99% rename from webrtc/voice_engine/test/channel_transport/traffic_control_win.cc rename to webrtc/test/channel_transport/traffic_control_win.cc index c0fc76dccc..3584359758 100644 --- a/webrtc/voice_engine/test/channel_transport/traffic_control_win.cc +++ b/webrtc/test/channel_transport/traffic_control_win.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/channel_transport/traffic_control_win.h" +#include "webrtc/test/channel_transport/traffic_control_win.h" #include diff --git a/webrtc/voice_engine/test/channel_transport/traffic_control_win.h b/webrtc/test/channel_transport/traffic_control_win.h similarity index 92% rename from webrtc/voice_engine/test/channel_transport/traffic_control_win.h rename to webrtc/test/channel_transport/traffic_control_win.h index 21019c5a66..1197b94b20 100644 --- a/webrtc/voice_engine/test/channel_transport/traffic_control_win.h +++ b/webrtc/test/channel_transport/traffic_control_win.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_TRAFFIC_CONTROL_WINDOWS_H_ -#define WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_TRAFFIC_CONTROL_WINDOWS_H_ +#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_TRAFFIC_CONTROL_WINDOWS_H_ +#define WEBRTC_TEST_CHANNEL_TRANSPORT_TRAFFIC_CONTROL_WINDOWS_H_ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -96,4 +96,4 @@ private: } // namespace test } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_TRAFFIC_CONTROL_WINDOWS_H_ +#endif // WEBRTC_TEST_CHANNEL_TRANSPORT_TRAFFIC_CONTROL_WINDOWS_H_ diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket2_manager_win.cc b/webrtc/test/channel_transport/udp_socket2_manager_win.cc similarity index 99% rename from webrtc/voice_engine/test/channel_transport/udp_socket2_manager_win.cc rename to webrtc/test/channel_transport/udp_socket2_manager_win.cc index bb268539f3..9f40350287 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket2_manager_win.cc +++ b/webrtc/test/channel_transport/udp_socket2_manager_win.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/channel_transport/udp_socket2_manager_win.h" +#include "webrtc/test/channel_transport/udp_socket2_manager_win.h" #include #include #include "webrtc/system_wrappers/include/aligned_malloc.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket2_win.h" +#include "webrtc/test/channel_transport/udp_socket2_win.h" namespace webrtc { namespace test { diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket2_manager_win.h b/webrtc/test/channel_transport/udp_socket2_manager_win.h similarity index 89% rename from webrtc/voice_engine/test/channel_transport/udp_socket2_manager_win.h rename to webrtc/test/channel_transport/udp_socket2_manager_win.h index ceba9c99e9..e762dccd0d 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket2_manager_win.h +++ b/webrtc/test/channel_transport/udp_socket2_manager_win.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_MANAGER_WINDOWS_H_ -#define WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_MANAGER_WINDOWS_H_ +#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_MANAGER_WINDOWS_H_ +#define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_MANAGER_WINDOWS_H_ #include #include @@ -18,9 +18,9 @@ #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/base/platform_thread.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket2_win.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h" -#include "webrtc/voice_engine/test/channel_transport/udp_transport.h" +#include "webrtc/test/channel_transport/udp_socket2_win.h" +#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" +#include "webrtc/test/channel_transport/udp_transport.h" #define MAX_IO_BUFF_SIZE 1600 @@ -159,4 +159,4 @@ private: } // namespace test } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_MANAGER_WINDOWS_H_ +#endif // WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_MANAGER_WINDOWS_H_ diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket2_win.cc b/webrtc/test/channel_transport/udp_socket2_win.cc similarity index 99% rename from webrtc/voice_engine/test/channel_transport/udp_socket2_win.cc rename to webrtc/test/channel_transport/udp_socket2_win.cc index ffe7139093..2858c2d002 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket2_win.cc +++ b/webrtc/test/channel_transport/udp_socket2_win.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/channel_transport/udp_socket2_win.h" +#include "webrtc/test/channel_transport/udp_socket2_win.h" #include #include @@ -16,8 +16,8 @@ #include "webrtc/base/format_macros.h" #include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/voice_engine/test/channel_transport/traffic_control_win.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket2_manager_win.h" +#include "webrtc/test/channel_transport/traffic_control_win.h" +#include "webrtc/test/channel_transport/udp_socket2_manager_win.h" #pragma warning(disable : 4311) diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket2_win.h b/webrtc/test/channel_transport/udp_socket2_win.h similarity index 93% rename from webrtc/voice_engine/test/channel_transport/udp_socket2_win.h rename to webrtc/test/channel_transport/udp_socket2_win.h index dd1aed80b8..b41be9727d 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket2_win.h +++ b/webrtc/test/channel_transport/udp_socket2_win.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_WINDOWS_H_ -#define WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_WINDOWS_H_ +#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_WINDOWS_H_ +#define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_WINDOWS_H_ // Disable deprication warning from traffic.h #pragma warning(disable : 4995) @@ -24,8 +24,8 @@ #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/rw_lock_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket2_manager_win.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket2_manager_win.h" +#include "webrtc/test/channel_transport/udp_socket_wrapper.h" namespace webrtc { namespace test { @@ -171,4 +171,4 @@ private: } // namespace test } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_WINDOWS_H_ +#endif // WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_WINDOWS_H_ diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_posix.cc b/webrtc/test/channel_transport/udp_socket_manager_posix.cc similarity index 98% rename from webrtc/voice_engine/test/channel_transport/udp_socket_manager_posix.cc rename to webrtc/test/channel_transport/udp_socket_manager_posix.cc index 6447e8bec1..6b1a466bf2 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_posix.cc +++ b/webrtc/test/channel_transport/udp_socket_manager_posix.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_posix.h" +#include "webrtc/test/channel_transport/udp_socket_manager_posix.h" #include #include @@ -19,7 +19,7 @@ #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_posix.h" +#include "webrtc/test/channel_transport/udp_socket_posix.h" namespace webrtc { namespace test { diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_posix.h b/webrtc/test/channel_transport/udp_socket_manager_posix.h similarity index 83% rename from webrtc/voice_engine/test/channel_transport/udp_socket_manager_posix.h rename to webrtc/test/channel_transport/udp_socket_manager_posix.h index fe32cf0160..92bff6b0ee 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_posix.h +++ b/webrtc/test/channel_transport/udp_socket_manager_posix.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_POSIX_H_ -#define WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_POSIX_H_ +#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_POSIX_H_ +#define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_POSIX_H_ #include #include @@ -19,8 +19,8 @@ #include "webrtc/base/platform_thread.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_wrapper.h" namespace webrtc { namespace test { @@ -85,4 +85,4 @@ private: } // namespace test } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_POSIX_H_ +#endif // WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_POSIX_H_ diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc b/webrtc/test/channel_transport/udp_socket_manager_unittest.cc similarity index 95% rename from webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc rename to webrtc/test/channel_transport/udp_socket_manager_unittest.cc index 812fb2347c..b49021bffe 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc +++ b/webrtc/test/channel_transport/udp_socket_manager_unittest.cc @@ -17,8 +17,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_wrapper.h" namespace webrtc { namespace test { diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.cc b/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc similarity index 87% rename from webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.cc rename to webrtc/test/channel_transport/udp_socket_manager_wrapper.cc index 4585c98e56..3127767cbc 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.cc +++ b/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" #include #ifdef _WIN32 #include "webrtc/system_wrappers/include/fix_interlocked_exchange_pointer_win.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket2_manager_win.h" +#include "webrtc/test/channel_transport/udp_socket2_manager_win.h" #else -#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_posix.h" +#include "webrtc/test/channel_transport/udp_socket_manager_posix.h" #endif namespace webrtc { diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h b/webrtc/test/channel_transport/udp_socket_manager_wrapper.h similarity index 88% rename from webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h rename to webrtc/test/channel_transport/udp_socket_manager_wrapper.h index 6484a72a83..0c3c3850d9 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h +++ b/webrtc/test/channel_transport/udp_socket_manager_wrapper.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_WRAPPER_H_ -#define WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_WRAPPER_H_ +#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_WRAPPER_H_ +#define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_WRAPPER_H_ #include "webrtc/system_wrappers/include/static_instance.h" #include "webrtc/typedefs.h" @@ -67,4 +67,4 @@ private: } // namespace test } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_WRAPPER_H_ +#endif // WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_WRAPPER_H_ diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_posix.cc b/webrtc/test/channel_transport/udp_socket_posix.cc similarity index 96% rename from webrtc/voice_engine/test/channel_transport/udp_socket_posix.cc rename to webrtc/test/channel_transport/udp_socket_posix.cc index e28396afe8..8ed5825dbc 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_posix.cc +++ b/webrtc/test/channel_transport/udp_socket_posix.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/channel_transport/udp_socket_posix.h" +#include "webrtc/test/channel_transport/udp_socket_posix.h" #include #include @@ -21,8 +21,8 @@ #include #include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_wrapper.h" namespace webrtc { namespace test { diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_posix.h b/webrtc/test/channel_transport/udp_socket_posix.h similarity index 89% rename from webrtc/voice_engine/test/channel_transport/udp_socket_posix.h rename to webrtc/test/channel_transport/udp_socket_posix.h index 98301330c2..537b52e393 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_posix.h +++ b/webrtc/test/channel_transport/udp_socket_posix.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_POSIX_H_ -#define WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_POSIX_H_ +#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_POSIX_H_ +#define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_POSIX_H_ #include #include @@ -18,7 +18,7 @@ #include "webrtc/base/event.h" #include "webrtc/base/criticalsection.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_wrapper.h" namespace webrtc { namespace test { @@ -91,4 +91,4 @@ private: } // namespace test } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_POSIX_H_ +#endif // WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_POSIX_H_ diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.cc b/webrtc/test/channel_transport/udp_socket_wrapper.cc similarity index 92% rename from webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.cc rename to webrtc/test/channel_transport/udp_socket_wrapper.cc index e02f0c5cb4..f4fa3e950b 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.cc +++ b/webrtc/test/channel_transport/udp_socket_wrapper.cc @@ -8,19 +8,19 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_wrapper.h" #include #include #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" #if defined(_WIN32) - #include "webrtc/voice_engine/test/channel_transport/udp_socket2_win.h" + #include "webrtc/test/channel_transport/udp_socket2_win.h" #else - #include "webrtc/voice_engine/test/channel_transport/udp_socket_posix.h" + #include "webrtc/test/channel_transport/udp_socket_posix.h" #endif diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h b/webrtc/test/channel_transport/udp_socket_wrapper.h similarity index 91% rename from webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h rename to webrtc/test/channel_transport/udp_socket_wrapper.h index 57f391cb21..d2a1ce6b61 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h +++ b/webrtc/test/channel_transport/udp_socket_wrapper.h @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_WRAPPER_H_ -#define WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_WRAPPER_H_ +#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_WRAPPER_H_ +#define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_WRAPPER_H_ -#include "webrtc/voice_engine/test/channel_transport/udp_transport.h" +#include "webrtc/test/channel_transport/udp_transport.h" namespace webrtc { @@ -109,4 +109,4 @@ private: } // namespac test } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_WRAPPER_H_ +#endif // WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_WRAPPER_H_ diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper_unittest.cc b/webrtc/test/channel_transport/udp_socket_wrapper_unittest.cc similarity index 93% rename from webrtc/voice_engine/test/channel_transport/udp_socket_wrapper_unittest.cc rename to webrtc/test/channel_transport/udp_socket_wrapper_unittest.cc index 4bbd849a12..885e19c237 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper_unittest.cc +++ b/webrtc/test/channel_transport/udp_socket_wrapper_unittest.cc @@ -22,8 +22,8 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_wrapper.h" using ::testing::_; using ::testing::Return; diff --git a/webrtc/voice_engine/test/channel_transport/udp_transport.h b/webrtc/test/channel_transport/udp_transport.h similarity index 98% rename from webrtc/voice_engine/test/channel_transport/udp_transport.h rename to webrtc/test/channel_transport/udp_transport.h index f406005b86..0c5079e69f 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_transport.h +++ b/webrtc/test/channel_transport/udp_transport.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_H_ -#define WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_H_ +#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_H_ +#define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_H_ #include "webrtc/common_types.h" #include "webrtc/transport.h" @@ -378,4 +378,4 @@ class UdpTransport : public Transport { } // namespace test } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_H_ +#endif // WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_H_ diff --git a/webrtc/voice_engine/test/channel_transport/udp_transport_impl.cc b/webrtc/test/channel_transport/udp_transport_impl.cc similarity index 99% rename from webrtc/voice_engine/test/channel_transport/udp_transport_impl.cc rename to webrtc/test/channel_transport/udp_transport_impl.cc index e265c1e84c..897c808522 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_transport_impl.cc +++ b/webrtc/test/channel_transport/udp_transport_impl.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/voice_engine/test/channel_transport/udp_transport_impl.h" +#include "webrtc/test/channel_transport/udp_transport_impl.h" #include #include @@ -48,7 +48,7 @@ #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/rw_lock_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" -#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" #include "webrtc/typedefs.h" #if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) diff --git a/webrtc/voice_engine/test/channel_transport/udp_transport_impl.h b/webrtc/test/channel_transport/udp_transport_impl.h similarity index 96% rename from webrtc/voice_engine/test/channel_transport/udp_transport_impl.h rename to webrtc/test/channel_transport/udp_transport_impl.h index 236ff53f5f..f80ee02d71 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_transport_impl.h +++ b/webrtc/test/channel_transport/udp_transport_impl.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_IMPL_H_ -#define WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_IMPL_H_ +#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_IMPL_H_ +#define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_IMPL_H_ -#include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h" -#include "webrtc/voice_engine/test/channel_transport/udp_transport.h" +#include "webrtc/test/channel_transport/udp_socket_wrapper.h" +#include "webrtc/test/channel_transport/udp_transport.h" namespace webrtc { @@ -256,4 +256,4 @@ private: } // namespace test } // namespace webrtc -#endif // WEBRTC_VOICE_ENGINE_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_IMPL_H_ +#endif // WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_IMPL_H_ diff --git a/webrtc/voice_engine/test/channel_transport/udp_transport_unittest.cc b/webrtc/test/channel_transport/udp_transport_unittest.cc similarity index 94% rename from webrtc/voice_engine/test/channel_transport/udp_transport_unittest.cc rename to webrtc/test/channel_transport/udp_transport_unittest.cc index f2f9d6ba6a..975f52b756 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_transport_unittest.cc +++ b/webrtc/test/channel_transport/udp_transport_unittest.cc @@ -12,12 +12,12 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/voice_engine/test/channel_transport/udp_transport.h" +#include "webrtc/test/channel_transport/udp_transport.h" // We include the implementation header file to get at the dependency-injecting // constructor. -#include "webrtc/voice_engine/test/channel_transport/udp_transport_impl.h" +#include "webrtc/test/channel_transport/udp_transport_impl.h" // We must mock the socket manager, for which we need its definition. -#include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h" +#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" using ::testing::_; using ::testing::Return; @@ -95,7 +95,7 @@ class UDPTransportTest : public ::testing::Test { } } - size_t NumSocketsCreated() { + int NumSocketsCreated() { return sockets_created_.size(); } @@ -133,7 +133,7 @@ TEST_F(UDPTransportTest, InitializeSourcePorts) { mock_maker, mock_manager); EXPECT_EQ(0, transport->InitializeSourcePorts(4711, 4712)); - EXPECT_EQ(2u, NumSocketsCreated()); + EXPECT_EQ(2, NumSocketsCreated()); delete transport; mock_manager->Destroy(); diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp index 86a32c3165..7f64b77aca 100644 --- a/webrtc/test/test.gyp +++ b/webrtc/test/test.gyp @@ -12,6 +12,55 @@ '../build/common.gypi', ], 'targets': [ + { + 'target_name': 'channel_transport', + 'type': 'static_library', + 'dependencies': [ + '<(DEPTH)/testing/gtest.gyp:gtest', + '<(webrtc_root)/common.gyp:webrtc_common', + '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', + ], + 'sources': [ + 'channel_transport/channel_transport.cc', + 'channel_transport/channel_transport.h', + 'channel_transport/traffic_control_win.cc', + 'channel_transport/traffic_control_win.h', + 'channel_transport/udp_socket_manager_posix.cc', + 'channel_transport/udp_socket_manager_posix.h', + 'channel_transport/udp_socket_manager_wrapper.cc', + 'channel_transport/udp_socket_manager_wrapper.h', + 'channel_transport/udp_socket_posix.cc', + 'channel_transport/udp_socket_posix.h', + 'channel_transport/udp_socket_wrapper.cc', + 'channel_transport/udp_socket_wrapper.h', + 'channel_transport/udp_socket2_manager_win.cc', + 'channel_transport/udp_socket2_manager_win.h', + 'channel_transport/udp_socket2_win.cc', + 'channel_transport/udp_socket2_win.h', + 'channel_transport/udp_transport.h', + 'channel_transport/udp_transport_impl.cc', + 'channel_transport/udp_transport_impl.h', + ], + 'msvs_disabled_warnings': [ + 4302, # cast truncation + ], + 'conditions': [ + ['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-parentheses-equality', + '-Wno-reorder', + '-Wno-tautological-constant-out-of-range-compare', + '-Wno-unused-private-field', + ], + }, + }, + }], + ], # conditions. + }, { 'target_name': 'video_test_common', 'type': 'static_library', @@ -153,6 +202,7 @@ 'target_name': 'test_support_unittests', 'type': '<(gtest_target_type)', 'dependencies': [ + 'channel_transport', 'test_common', 'test_support_main', '<(webrtc_root)/modules/modules.gyp:video_capture', @@ -164,6 +214,9 @@ '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', 'testsupport/always_passing_unittest.cc', 'testsupport/unittest_utils.h', 'testsupport/fileutils_unittest.cc', diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn index 8e7e29ae2f..e773ebd049 100644 --- a/webrtc/voice_engine/BUILD.gn +++ b/webrtc/voice_engine/BUILD.gn @@ -120,70 +120,8 @@ rtc_source_set("level_indicator") { } if (rtc_include_tests) { - config("channel_transport_warnings_config") { - if (is_win) { - cflags = [ "/wd4302" ] # cast truncation - - if (is_clang) { - # GN orders flags on a target before flags from configs. The default - # config adds -Wall, and this flag have to be after -Wall -- so they need - # to come from a config and cannot be on the target directly. - cflags += [ - "-Wno-parentheses-equality", - "-Wno-reorder", - "-Wno-tautological-constant-out-of-range-compare", - - # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6268 - # for -Wno-thread-safety-analysis - "-Wno-thread-safety-analysis", - "-Wno-unused-private-field", - ] - } - } - } - - rtc_source_set("channel_transport") { - testonly = true - sources = [ - "test/channel_transport/channel_transport.cc", - "test/channel_transport/channel_transport.h", - "test/channel_transport/traffic_control_win.cc", - "test/channel_transport/traffic_control_win.h", - "test/channel_transport/udp_socket2_manager_win.cc", - "test/channel_transport/udp_socket2_manager_win.h", - "test/channel_transport/udp_socket2_win.cc", - "test/channel_transport/udp_socket2_win.h", - "test/channel_transport/udp_socket_manager_posix.cc", - "test/channel_transport/udp_socket_manager_posix.h", - "test/channel_transport/udp_socket_manager_wrapper.cc", - "test/channel_transport/udp_socket_manager_wrapper.h", - "test/channel_transport/udp_socket_posix.cc", - "test/channel_transport/udp_socket_posix.h", - "test/channel_transport/udp_socket_wrapper.cc", - "test/channel_transport/udp_socket_wrapper.h", - "test/channel_transport/udp_transport.h", - "test/channel_transport/udp_transport_impl.cc", - "test/channel_transport/udp_transport_impl.h", - ] - - configs += [ ":channel_transport_warnings_config" ] - - if (is_clang && !is_nacl) { - # Suppress warnings from the Chromium Clang plugin. - # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. - suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] - } - - deps = [ - "..:webrtc_common", - "../system_wrappers", - "//testing/gtest", - ] - } - rtc_test("voice_engine_unittests") { deps = [ - ":channel_transport", ":voice_engine", "//testing/gmock", "//testing/gtest", @@ -207,9 +145,6 @@ if (rtc_include_tests) { sources = [ "channel_unittest.cc", "network_predictor_unittest.cc", - "test/channel_transport/udp_socket_manager_unittest.cc", - "test/channel_transport/udp_socket_wrapper_unittest.cc", - "test/channel_transport/udp_transport_unittest.cc", "transmit_mixer_unittest.cc", "utility_unittest.cc", "voe_audio_processing_unittest.cc", @@ -241,7 +176,6 @@ if (rtc_include_tests) { testonly = true deps = [ - ":channel_transport", ":voice_engine", "//testing/gmock", "//testing/gtest", @@ -250,6 +184,7 @@ if (rtc_include_tests) { "//webrtc/modules/video_capture", "//webrtc/system_wrappers", "//webrtc/system_wrappers/:system_wrappers_default", + "//webrtc/test/:channel_transport", "//webrtc/test/:test_common", "//webrtc/test/:test_support", ] diff --git a/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc b/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc index 9040ba99bb..3bf51aa0ff 100644 --- a/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc @@ -19,7 +19,7 @@ #include -#include "webrtc/voice_engine/test/channel_transport/channel_transport.h" +#include "webrtc/test/channel_transport/channel_transport.h" #include "webrtc/voice_engine/test/auto_test/voe_test_defines.h" using namespace webrtc; diff --git a/webrtc/voice_engine/test/auto_test/voe_output_test.cc b/webrtc/voice_engine/test/auto_test/voe_output_test.cc index 4044fbaf42..795dac5c0a 100644 --- a/webrtc/voice_engine/test/auto_test/voe_output_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_output_test.cc @@ -12,7 +12,7 @@ #include "webrtc/base/random.h" #include "webrtc/base/timeutils.h" #include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/voice_engine/test/channel_transport/channel_transport.h" +#include "webrtc/test/channel_transport/channel_transport.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" diff --git a/webrtc/voice_engine/test/auto_test/voe_stress_test.cc b/webrtc/voice_engine/test/auto_test/voe_stress_test.cc index 56922d8e85..0b5660ff54 100644 --- a/webrtc/voice_engine/test/auto_test/voe_stress_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_stress_test.cc @@ -25,7 +25,7 @@ #include "webrtc/voice_engine/test/auto_test/voe_stress_test.h" #include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/voice_engine/test/channel_transport/channel_transport.h" +#include "webrtc/test/channel_transport/channel_transport.h" #include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" #include "webrtc/voice_engine/test/auto_test/voe_test_defines.h" #include "webrtc/voice_engine/voice_engine_defines.h" // defines build macros diff --git a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc index 5ff76cfa31..9f82e87b65 100644 --- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc +++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc @@ -23,7 +23,7 @@ #include "webrtc/base/format_macros.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/voice_engine/test/channel_transport/channel_transport.h" +#include "webrtc/test/channel_transport/channel_transport.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/trace_to_stderr.h" #include "webrtc/voice_engine/include/voe_audio_processing.h" diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp index 0ab0f84c05..dd6de61a52 100644 --- a/webrtc/voice_engine/voice_engine.gyp +++ b/webrtc/voice_engine/voice_engine.gyp @@ -107,57 +107,7 @@ 'level_indicator.cc', 'level_indicator.h', ] - }, - { - 'target_name': 'channel_transport', - 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/testing/gtest.gyp:gtest', - '<(webrtc_root)/common.gyp:webrtc_common', - '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', - ], - 'sources': [ - 'test/channel_transport/channel_transport.cc', - 'test/channel_transport/channel_transport.h', - 'test/channel_transport/traffic_control_win.cc', - 'test/channel_transport/traffic_control_win.h', - 'test/channel_transport/udp_socket_manager_posix.cc', - 'test/channel_transport/udp_socket_manager_posix.h', - 'test/channel_transport/udp_socket_manager_wrapper.cc', - 'test/channel_transport/udp_socket_manager_wrapper.h', - 'test/channel_transport/udp_socket_posix.cc', - 'test/channel_transport/udp_socket_posix.h', - 'test/channel_transport/udp_socket_wrapper.cc', - 'test/channel_transport/udp_socket_wrapper.h', - 'test/channel_transport/udp_socket2_manager_win.cc', - 'test/channel_transport/udp_socket2_manager_win.h', - 'test/channel_transport/udp_socket2_win.cc', - 'test/channel_transport/udp_socket2_win.h', - 'test/channel_transport/udp_transport.h', - 'test/channel_transport/udp_transport_impl.cc', - 'test/channel_transport/udp_transport_impl.h', - ], - 'msvs_disabled_warnings': [ - 4302, # cast truncation - ], - 'conditions': [ - ['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-parentheses-equality', - '-Wno-reorder', - '-Wno-tautological-constant-out-of-range-compare', - '-Wno-unused-private-field', - ], - }, - }, - }], - ], # conditions. - }, - + } ], 'conditions': [ ['OS=="win"', { @@ -169,7 +119,6 @@ 'target_name': 'voice_engine_unittests', 'type': '<(gtest_target_type)', 'dependencies': [ - 'channel_transport', 'voice_engine', '<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gtest.gyp:gtest', @@ -189,9 +138,6 @@ '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', @@ -214,12 +160,12 @@ 'target_name': 'voe_cmd_test', 'type': 'executable', 'dependencies': [ - 'channel_transport', 'voice_engine', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', + '<(webrtc_root)/test/test.gyp:channel_transport', '<(webrtc_root)/test/test.gyp:test_support', '<(webrtc_root)/webrtc.gyp:rtc_event_log', ], @@ -235,13 +181,13 @@ '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:channel_transport', '<(webrtc_root)/test/test.gyp:test_common', '<(webrtc_root)/test/test.gyp:test_support', '<(webrtc_root)/webrtc.gyp:rtc_event_log', diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index 79e011f262..47a6833a4a 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -385,6 +385,7 @@ '<(webrtc_root)/common.gyp:webrtc_common', '<(webrtc_root)/modules/modules.gyp:rtp_rtcp', '<(webrtc_root)/modules/modules.gyp:video_capture', + '<(webrtc_root)/test/test.gyp:channel_transport', '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', 'test/test.gyp:test_common', 'test/test.gyp:test_main', @@ -443,6 +444,7 @@ '<(webrtc_root)/modules/modules.gyp:audio_processing', '<(webrtc_root)/modules/modules.gyp:audioproc_test_utils', '<(webrtc_root)/modules/modules.gyp:video_capture', + '<(webrtc_root)/test/test.gyp:channel_transport', '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', 'video_quality_test', 'modules/modules.gyp:neteq_test_support',