From fe61bc3607f53b59007c3f7d2f194bd9f0a00967 Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Mon, 12 Dec 2011 17:02:16 +0000 Subject: [PATCH] Merge branch 'master' into voe_create_test Fixed broken build. Nit fix. Fixed style issues. Removed accidental comment-out. Removed test that no longer makes sense. Rewrote hardware-before-init and rtp-rtcp-before-streaming test code to gtest. BUG= TEST= Review URL: http://webrtc-codereview.appspot.com/320009 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1162 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/voice_engine/main/test/voice_engine_tests.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/src/voice_engine/main/test/voice_engine_tests.gypi b/src/voice_engine/main/test/voice_engine_tests.gypi index 8163c5c0c..687c54f9f 100644 --- a/src/voice_engine/main/test/voice_engine_tests.gypi +++ b/src/voice_engine/main/test/voice_engine_tests.gypi @@ -32,7 +32,6 @@ 'auto_test/voe_cpu_test.h', 'auto_test/voe_extended_test.cc', 'auto_test/voe_extended_test.h', - 'auto_test/voe_standard_integration_test.cc', 'auto_test/voe_standard_test.cc', 'auto_test/voe_standard_test.h', 'auto_test/voe_stress_test.cc',