From 86a9f9b94681654b284e768c8974262d2f533341 Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Mon, 19 Dec 2011 10:24:46 +0000 Subject: [PATCH] Fixed build error. Merge branch 'master' into voe_rewrites Conflicts: src/voice_engine/main/test/auto_test/standard/after_streaming_fixture.cc Revert "Rewrote network-before-streaming." This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459. Rewrote network-before-streaming. Fixed strange build error. Merge branch 'master' into voe_rewrites Revert "Rewrote network-before-streaming." This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459. Rewrote network-before-streaming. Nit fixes Clarified some comments and method names. Style fixes. Removed tab characters. Merge branch 'master' into voe_rewrites Conflicts: src/voice_engine/main/test/auto_test/voe_standard_test.cc Revert "Rewrote network-before-streaming." This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459. Rewrote network-before-streaming. Rewrote the hold test. Abstracted out resource handling and created a new fixture for starting and stopping playing. Rewrote network-before-streaming. Revert "Rewrote network-before-streaming." This reverts commit f1a07b813a90e4feef0a0737ebde9fb15acfd459. Rewrote network-before-streaming. BUG= TEST= Review URL: http://webrtc-codereview.appspot.com/333007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1230 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/test/auto_test/standard/after_streaming_fixture.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/voice_engine/main/test/auto_test/standard/after_streaming_fixture.cc b/src/voice_engine/main/test/auto_test/standard/after_streaming_fixture.cc index afac0bf36..3fac8eed1 100644 --- a/src/voice_engine/main/test/auto_test/standard/after_streaming_fixture.cc +++ b/src/voice_engine/main/test/auto_test/standard/after_streaming_fixture.cc @@ -21,7 +21,7 @@ AfterStreamingFixture::AfterStreamingFixture() EXPECT_GE(channel_, 0); const std::string& input_file = resource_manager_.long_audio_file_path(); - ASSERT_FALSE(input_file.empty()); + EXPECT_FALSE(input_file.empty()); SetUpLocalPlayback(); StartPlaying(input_file);