Index: tools/run-tests.py |
diff --git a/tools/run-tests.py b/tools/run-tests.py |
index 55c1eb9a465f5bf930db1c387745321bd418ed13..3a40e58a4476b59ae0a4d96872b59af960d6fb51 100755 |
--- a/tools/run-tests.py |
+++ b/tools/run-tests.py |
@@ -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 |