commit 28947508489a9c608fa82d8fb694baf1488dd41d
author Sebastian Jansson <srte@webrtc.org> Thu Dec 20 09:42:51 2018
committer Commit Bot <commit-bot@chromium.org> Thu Dec 20 13:05:31 2018
tree 9ba2c5c0937fb177271c691b67bbff14f987d798
parent d69998aa5c4f781aa08efed3bafe0a4e25f38338

Adds flag to customize output root dir in scenario tests.

Bug: webrtc:9510
Change-Id: I005baffc0b0166dc39f5f387b1d3b5caa1f350a9
Reviewed-on: https://webrtc-review.googlesource.com/c/115200
Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26071}

test/scenario/scenario.cc

diff --git a/test/scenario/scenario.cc b/test/scenario/scenario.cc
index 8deaead..3537d74 100644
--- a/test/scenario/scenario.cc
+++ b/test/scenario/scenario.cc
@@ -17,6 +17,9 @@
 #include "test/testsupport/fileutils.h"
 
 WEBRTC_DEFINE_bool(scenario_logs, false, "Save logs from scenario framework.");
+WEBRTC_DEFINE_string(out_root,
+                     "",
+                     "Output root path, based on project root if unset.");
 
 namespace webrtc {
 namespace test {
@@ -60,12 +63,16 @@
       audio_decoder_factory_(CreateBuiltinAudioDecoderFactory()),
       audio_encoder_factory_(CreateBuiltinAudioEncoderFactory()) {
   if (FLAG_scenario_logs && !file_name.empty()) {
-    CreateDir(OutputPath() + "output_data");
+    std::string output_root = FLAG_out_root;
+    if (output_root.empty())
+      output_root = OutputPath() + "output_data/";
+    if (output_root.back() == '/')
+      CreateDir(output_root);
     for (size_t i = 0; i < file_name.size(); ++i) {
       if (file_name[i] == '/')
-        CreateDir(OutputPath() + "output_data/" + file_name.substr(0, i));
+        CreateDir(output_root + file_name.substr(0, i));
     }
-    base_filename_ = OutputPath() + "output_data/" + file_name;
+    base_filename_ = output_root + file_name;
     RTC_LOG(LS_INFO) << "Saving scenario logs to: " << base_filename_;
   }
   if (!real_time_mode_ && !base_filename_.empty()) {