Chromium Code Reviews| Index: tools/run-tests.py |
| diff --git a/tools/run-tests.py b/tools/run-tests.py |
| index 55c1eb9a465f5bf930db1c387745321bd418ed13..96d954192d841cf5e756b25960a9fcdfe8910f70 100755 |
| --- a/tools/run-tests.py |
| +++ b/tools/run-tests.py |
| @@ -826,6 +826,13 @@ 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. |
| + exit_code |= subprocess.call([ |
| + sys.executable, |
| + join(BASE_DIR, "tools", "sanitizers", "sancov_merger.py"), |
| + "--coverage-dir=%s" % options.sancov_dir]) |
| + |
|
kjellander_chromium
2016/03/08 20:30:53
Maybe you'd want to use check_call and try+except
|
| return exit_code |