diff options
Diffstat (limited to 'chromium/build/fuchsia/run_package.py')
| -rw-r--r-- | chromium/build/fuchsia/run_package.py | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/chromium/build/fuchsia/run_package.py b/chromium/build/fuchsia/run_package.py index 62bbd3b8fd8..ed2cca3bf12 100644 --- a/chromium/build/fuchsia/run_package.py +++ b/chromium/build/fuchsia/run_package.py @@ -16,12 +16,10 @@ import re import select import subprocess import sys -import time import threading import uuid -from symbolizer import RunSymbolizer -from symbolizer import SymbolizerFilter +from symbolizer import BuildIdsPaths, RunSymbolizer, SymbolizerFilter FAR = common.GetHostToolPathFromPlatform('far') @@ -34,16 +32,8 @@ def _AttachKernelLogReader(target): logging.info('Attaching kernel logger.') return target.RunCommandPiped(['dlog', '-f'], stdin=open(os.devnull, 'r'), - stdout=subprocess.PIPE) - - -def _BuildIdsPaths(package_paths): - """Generate build ids paths for symbolizer processes.""" - build_ids_paths = map( - lambda package_path: os.path.join( - os.path.dirname(package_path), 'ids.txt'), - package_paths) - return build_ids_paths + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) class SystemLogReader(object): @@ -77,7 +67,7 @@ class SystemLogReader(object): self._system_log = open(system_log_file,'w', buffering=1) self._symbolizer_proc = RunSymbolizer(self._listener_proc.stdout, self._system_log, - _BuildIdsPaths(package_paths)) + BuildIdsPaths(package_paths)) class MergedInputStream(object): @@ -239,7 +229,7 @@ def RunPackage(output_dir, target, package_paths, package_name, # Run the log data through the symbolizer process. output_stream = SymbolizerFilter(output_stream, - _BuildIdsPaths(package_paths)) + BuildIdsPaths(package_paths)) for next_line in output_stream: print(next_line.rstrip()) |