From 95153cc4cd9664afb04c5b45c8b49ad0e226108f Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Wed, 12 Mar 2014 13:22:00 +0000 Subject: [PATCH] Remove platform-specific code from new-API tests. We've had problems that seem to manifest in run_tests.mm getting stuck on exit. For our automated test targets only full_stack.cc was making use of the platform-specific renderers provided by webrtc_test_common and since no one currently monitors these the use case is hypothetical. Readding platform-specific renderers to video_loopback is tracked with issue 3039, though as far as I'm aware no one's currently using the video_loopback target. BUG=2987 R=kjellander@webrtc.org, stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/9789004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5686 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/test/webrtc_test_common.gyp | 42 +++--------------------------- webrtc/video/full_stack.cc | 1 - 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/webrtc/test/webrtc_test_common.gyp b/webrtc/test/webrtc_test_common.gyp index eac8b97ec..6920ab843 100644 --- a/webrtc/test/webrtc_test_common.gyp +++ b/webrtc/test/webrtc_test_common.gyp @@ -30,14 +30,6 @@ 'flags.h', 'frame_generator_capturer.cc', 'frame_generator_capturer.h', - 'gl/gl_renderer.cc', - 'gl/gl_renderer.h', - 'linux/glx_renderer.cc', - 'linux/glx_renderer.h', - 'linux/video_renderer_linux.cc', - 'mac/run_tests.mm', - 'mac/video_renderer_mac.h', - 'mac/video_renderer_mac.mm', 'mock_transport.h', 'null_platform_renderer.cc', 'null_transport.cc', @@ -55,35 +47,10 @@ 'video_capturer.h', 'video_renderer.cc', 'video_renderer.h', - 'win/d3d_renderer.cc', - 'win/d3d_renderer.h', - 'win/run_loop_win.cc', - ], - 'conditions': [ - ['OS=="linux"', { - 'sources!': [ - 'null_platform_renderer.cc', - ], - }], - ['OS=="mac"', { - 'sources!': [ - 'null_platform_renderer.cc', - 'run_tests.cc', - ], - }], - ['OS!="linux" and OS!="mac"', { - 'sources!' : [ - 'gl/gl_renderer.cc', - 'gl/gl_renderer.h', - ], - }], - ['OS=="win"', { - 'sources!': [ - 'null_platform_renderer.cc', - 'run_loop.cc', - ], - }], ], + # TODO(pbos): As far as I can tell these are dependencies from + # video_render and they should really not be here. This target provides + # no platform-specific rendering. 'direct_dependent_settings': { 'conditions': [ ['OS=="linux"', { @@ -93,9 +60,6 @@ '-lGL', ], }], - #TODO(pbos) : These dependencies should not have to be here, they - # aren't used by test code directly, only by components - # used by the tests. ['OS=="android"', { 'libraries' : [ '-lGLESv2', '-llog', diff --git a/webrtc/video/full_stack.cc b/webrtc/video/full_stack.cc index 1181bfe48..9b0def6f8 100644 --- a/webrtc/video/full_stack.cc +++ b/webrtc/video/full_stack.cc @@ -27,7 +27,6 @@ #include "webrtc/test/direct_transport.h" #include "webrtc/test/frame_generator_capturer.h" #include "webrtc/test/statistics.h" -#include "webrtc/test/video_renderer.h" #include "webrtc/typedefs.h" DEFINE_int32(seconds, 10, "Seconds to run each clip.");