1 files changed, 35 insertions, 31 deletions
diff --git a/chromium/build/fuchsia/test_runner.py b/chromium/build/fuchsia/test_runner.py
index 37992fd2fe1..5033a245c49 100755
--- a/chromium/build/fuchsia/test_runner.py
+++ b/chromium/build/fuchsia/test_runner.py
@@ -10,6 +10,7 @@ import argparse
 import json
 import logging
 import os
+import runner_logs
 import socket
 import subprocess
 import sys
@@ -20,6 +21,8 @@ from common_args import AddCommonArgs, ConfigureLogging, GetDeploymentTargetForA
 from net_test_server import SetupTestServer
 from run_package import RunPackage, RunPackageArgs, SystemLogReader
 from runner_exceptions import HandleExceptionAndReturnExitCode
+from runner_logs import RunnerLogManager
+from symbolizer import BuildIdsPaths
 
 DEFAULT_TEST_SERVER_CONCURRENCY = 4
 
@@ -140,37 +143,38 @@ def main():
     child_args.extend(args.child_args)
 
   try:
-    with GetDeploymentTargetForArgs(args) as target:
-      with SystemLogReader() as system_logger:
-        target.Start()
-
-        if args.system_log_file and args.system_log_file != '-':
-          system_logger.Start(target, args.package, args.system_log_file)
-
-        if args.test_launcher_filter_file:
-          target.PutFile(args.test_launcher_filter_file, TEST_FILTER_PATH,
-                        for_package=args.package_name)
-          child_args.append('--test-launcher-filter-file=' + TEST_FILTER_PATH)
-
-        test_server = None
-        if args.enable_test_server:
-          assert test_concurrency
-          test_server = SetupTestServer(target, test_concurrency,
-                                        args.package_name)
-
-        run_package_args = RunPackageArgs.FromCommonArgs(args)
-        returncode = RunPackage(
-            args.output_directory, target, args.package, args.package_name,
-            child_args, run_package_args)
-
-        if test_server:
-          test_server.Stop()
-
-        if args.test_launcher_summary_output:
-          target.GetFile(TEST_RESULT_PATH, args.test_launcher_summary_output,
-                        for_package=args.package_name)
-
-        return returncode
+    with GetDeploymentTargetForArgs(args) as target, \
+         SystemLogReader() as system_logger, \
+         RunnerLogManager(args.runner_logs_dir, BuildIdsPaths(args.package)):
+      target.Start()
+
+      if args.system_log_file and args.system_log_file != '-':
+        system_logger.Start(target, args.package, args.system_log_file)
+
+      if args.test_launcher_filter_file:
+        target.PutFile(args.test_launcher_filter_file, TEST_FILTER_PATH,
+                      for_package=args.package_name)
+        child_args.append('--test-launcher-filter-file=' + TEST_FILTER_PATH)
+
+      test_server = None
+      if args.enable_test_server:
+        assert test_concurrency
+        test_server = SetupTestServer(target, test_concurrency,
+                                      args.package_name)
+
+      run_package_args = RunPackageArgs.FromCommonArgs(args)
+      returncode = RunPackage(
+          args.output_directory, target, args.package, args.package_name,
+          child_args, run_package_args)
+
+      if test_server:
+        test_server.Stop()
+
+      if args.test_launcher_summary_output:
+        target.GetFile(TEST_RESULT_PATH, args.test_launcher_summary_output,
+                      for_package=args.package_name)
+
+      return returncode
 
   except:
     return HandleExceptionAndReturnExitCode()