generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove CallTest dependency on voice_engine/test/.

Browse Source 
Loading file out of resources/ instead of data/ which is deprecated.

BUG=
R=holmer@google.com, mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/5069004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5226 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-12-05 14:24:17 +00:00
parent 0a3c1471b8
commit 5cea89f3e1
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/video/call_tests.cc
View File

@ -31,13 +31,13 @@
#include "webrtc/voice_engine/include/voe_network.h"
#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
#include "webrtc/voice_engine/include/voe_video_sync.h"
#include "webrtc/voice_engine/test/auto_test/resource_manager.h"
#include "webrtc/test/direct_transport.h"
#include "webrtc/test/fake_audio_device.h"
#include "webrtc/test/fake_decoder.h"
#include "webrtc/test/fake_encoder.h"
#include "webrtc/test/frame_generator_capturer.h"
#include "webrtc/test/rtp_rtcp_observer.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/perf_test.h"
namespace webrtc {
@ -997,8 +997,8 @@ TEST_F(CallTest, PlaysOutAudioAndVideoInSync) {
VoECodec* voe_codec = VoECodec::GetInterface(voice_engine);
VoENetwork* voe_network = VoENetwork::GetInterface(voice_engine);
VoEVideoSync* voe_sync = VoEVideoSync::GetInterface(voice_engine);
ResourceManager resource_manager;
const std::string audio_filename = resource_manager.long_audio_file_path();
const std::string audio_filename =
test::ResourcePath("voice_engine/audio_long16", "pcm");
ASSERT_STRNE("", audio_filename.c_str());
test::FakeAudioDevice fake_audio_device(Clock::GetRealTimeClock(),
audio_filename);

2
webrtc/video_engine_tests.isolate
View File

@ -26,9 +26,9 @@
],
'isolate_dependency_tracked': [
'../DEPS',
'../data/voice_engine/audio_long16.pcm',
'../resources/foreman_cif.yuv',
'../resources/paris_qcif.yuv',
'../resources/voice_engine/audio_long16.pcm',
'../testing/test_env.py',
'<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)',
],

2
webrtc/webrtc_tests.gypi
View File

@ -36,8 +36,6 @@
'video/full_stack.cc',
'video/rampup_tests.cc',
'video/video_send_stream_tests.cc',
'voice_engine/test/auto_test/resource_manager.cc',
'voice_engine/test/auto_test/resource_manager.h',
'test/common_unittest.cc',
'test/test_main.cc',
],