[coverage] Always merge sancov files after testing.
With this, the test runner automatically merges sancov files after testing. There's no need to do this by some external infrastructure. In a future CL, we could even merge during testing to lift harddisk pressure. BUG=chromium:568949 LOG=n NOTRY=true Review URL: https://codereview.chromium.org/1776123002 Cr-Commit-Position: refs/heads/master@{#34606}
This commit is contained in:
parent
bcc8cb5091
commit
74282397e4
@ -826,6 +826,18 @@ def Execute(arch, mode, args, options, suites):
|
||||
"with failure information.")
|
||||
exit_code = 0
|
||||
|
||||
if options.sancov_dir:
|
||||
# If tests ran with sanitizer coverage, merge coverage files in the end.
|
||||
try:
|
||||
print "Merging sancov files."
|
||||
subprocess.check_call([
|
||||
sys.executable,
|
||||
join(BASE_DIR, "tools", "sanitizers", "sancov_merger.py"),
|
||||
"--coverage-dir=%s" % options.sancov_dir])
|
||||
except:
|
||||
print >> sys.stderr, "Error: Merging sancov files failed."
|
||||
exit_code = 1
|
||||
|
||||
return exit_code
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user