Index: build/coverage_wrapper.py |
diff --git a/build/coverage_wrapper.py b/build/coverage_wrapper.py |
index c1db754c94c1b4c323bda1551f482d007dc0fb50..5266bbf7af0603fc8c3ab0a7d24af349e901323c 100755 |
--- a/build/coverage_wrapper.py |
+++ b/build/coverage_wrapper.py |
@@ -11,18 +11,28 @@ import subprocess |
import sys |
exclusions = [ |
+ 'buildtools', |
'src/third_party', |
'third_party', |
'test', |
'testing', |
] |
+def remove_failsafe(l, item): |
kjellander_chromium
2016/03/04 14:35:22
rename variable "l" to something more describing,
Michael Achenbach
2016/03/04 15:00:25
Done.
tandrii(chromium)
2016/03/07 15:10:22
nit: maybe remove_if_exists?
Michael Achenbach
2016/03/07 16:07:20
Done.
|
+ try: |
+ l.remove(item) |
+ except: |
+ pass |
+ |
args = sys.argv[1:] |
text = ' '.join(sys.argv[2:]) |
for exclusion in exclusions: |
if re.search(r'\-o obj/%s[^ ]*\.o' % exclusion, text): |
- args.remove('-fprofile-arcs') |
- args.remove('-ftest-coverage') |
+ remove_failsafe(args, '-fprofile-arcs') |
+ remove_failsafe(args, '-ftest-coverage') |
+ remove_failsafe(args, '-fsanitize-coverage=func') |
+ remove_failsafe(args, '-fsanitize-coverage=bb') |
+ remove_failsafe(args, '-fsanitize-coverage=edge') |
break |
sys.exit(subprocess.check_call(args)) |