From 7de3bb9df972db3846eecbe6a236d7f108654bf0 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Tue, 21 Jan 2014 22:17:43 +0000 Subject: [PATCH] Output logs to stderr from voe_cmd_test by default. Add a flag --log_file which produces the existing behaviour of dumping logs of all severities to a file. By default, warnings and errors will now be output to stderr. This is generally more useful for the testing done with voe_cmd_test. TESTED=logs output to stderr by default and to the usual file when the flag is specified. R=tnakamura@webrtc.org Review URL: https://webrtc-codereview.appspot.com/6849005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5409 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../test/cmd_test/voe_cmd_test.cc | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) 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 68d096dd89..43e8ee74e6 100644 --- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc +++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc @@ -27,6 +27,7 @@ #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/test/channel_transport/include/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" #include "webrtc/voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_codec.h" @@ -44,6 +45,8 @@ DEFINE_bool(use_acm_version_2, false, "If true, we'll run the tests with Audio Coding Module version 2."); +DEFINE_bool(use_log_file, false, + "Output logs to a file; by default they will be printed to stderr."); using namespace webrtc; using namespace test; @@ -149,16 +152,18 @@ int main(int argc, char** argv) { MyObserver my_observer; - const std::string out_path = webrtc::test::OutputPath(); - const std::string trace_filename = out_path + "webrtc_trace.txt"; - - printf("Set trace filenames (enable trace)\n"); - VoiceEngine::SetTraceFilter(kTraceAll); - res = VoiceEngine::SetTraceFile(trace_filename.c_str()); - VALIDATE; - - res = VoiceEngine::SetTraceCallback(NULL); - VALIDATE; + scoped_ptr trace_to_stderr; + if (!FLAGS_use_log_file) { + trace_to_stderr.reset(new test::TraceToStderr); + } else { + const std::string trace_filename = test::OutputPath() + "webrtc_trace.txt"; + VoiceEngine::SetTraceFilter(kTraceAll); + res = VoiceEngine::SetTraceFile(trace_filename.c_str()); + VALIDATE; + res = VoiceEngine::SetTraceCallback(NULL); + VALIDATE; + printf("Outputting logs to file: %s\n", trace_filename.c_str()); + } printf("Init\n"); res = base1->Init(); @@ -177,7 +182,7 @@ int main(int argc, char** argv) { VALIDATE; printf("%s\n", tmp); - RunTest(out_path); + RunTest(test::OutputPath()); printf("Terminate \n");