Enable stack tool and ASan symbolization of logcat on Android bots.
BUG=325685 R=frankf@chromium.org, craigdh@chromium.org, navabi@chromium.org Review URL: https://codereview.chromium.org/149503002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@248694 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
3a04db53e1
Коммит
03fb2191cf
|
@ -530,6 +530,23 @@ def LogcatDump(options):
|
|||
RunCmd(['cat', logcat_file])
|
||||
|
||||
|
||||
def RunStackToolSteps(options):
|
||||
"""Run stack tool steps.
|
||||
|
||||
Stack tool is run for logcat dump, optionally for ASAN.
|
||||
"""
|
||||
bb_annotations.PrintNamedStep('Run stack tool with logcat dump')
|
||||
logcat_file = os.path.join(CHROME_OUT_DIR, options.target, 'full_log')
|
||||
RunCmd([os.path.join(CHROME_SRC_DIR, 'third_party', 'android_platform',
|
||||
'development', 'scripts', 'stack'),
|
||||
'--more-info', logcat_file])
|
||||
if options.asan_symbolize:
|
||||
bb_annotations.PrintNamedStep('Run stack tool for ASAN')
|
||||
RunCmd([
|
||||
os.path.join(CHROME_SRC_DIR, 'build', 'android', 'asan_symbolize.py'),
|
||||
'-l', logcat_file])
|
||||
|
||||
|
||||
def GenerateTestReport(options):
|
||||
bb_annotations.PrintNamedStep('test_report')
|
||||
for report in glob.glob(
|
||||
|
@ -566,6 +583,8 @@ def MainTestWrapper(options):
|
|||
finally:
|
||||
# Run all post test steps
|
||||
LogcatDump(options)
|
||||
if not options.disable_stack_tool:
|
||||
RunStackToolSteps(options)
|
||||
GenerateTestReport(options)
|
||||
# KillHostHeartbeat() has logic to check if heartbeat process is running,
|
||||
# and kills only if it finds the process is running on the host.
|
||||
|
@ -602,7 +621,10 @@ def GetDeviceStepsOptParser():
|
|||
parser.add_option(
|
||||
'--logcat-dump-output',
|
||||
help='The logcat dump output will be "tee"-ed into this file')
|
||||
|
||||
parser.add_option('--disable-stack-tool', action='store_true',
|
||||
help='Do not run stack tool.')
|
||||
parser.add_option('--asan-symbolize', action='store_true',
|
||||
help='Run stack tool for ASAN')
|
||||
return parser
|
||||
|
||||
|
||||
|
|
|
@ -142,7 +142,7 @@ def GetBotStepMap():
|
|||
|
||||
# Other waterfalls
|
||||
B('asan-builder-tests', H(compile_step, extra_gyp='asan=1'),
|
||||
T(std_tests, ['--asan'])),
|
||||
T(std_tests, ['--asan', '--asan-symbolize'])),
|
||||
B('blink-try-builder', H(compile_step)),
|
||||
B('chromedriver-fyi-tests-dbg', H(std_test_steps),
|
||||
T(['chromedriver'], ['--install=ChromiumTestShell'])),
|
||||
|
|
Загрузка…
Ссылка в новой задаче