Commit 56c37d90 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Make this work with llvm's code coverage tools

parent df909f16
...@@ -106,14 +106,14 @@ def run_gcov(prog, subdir): ...@@ -106,14 +106,14 @@ def run_gcov(prog, subdir):
if root[-6:] == "/.libs": if root[-6:] == "/.libs":
x = subprocess.check_output( x = subprocess.check_output(
["cd " + root + "/.. && " + ["cd " + root + "/.. && " +
"exec " + prog + " -r .libs/" + fn], "exec " + prog + " .libs/" + fn],
stderr=subprocess.STDOUT, shell=True, stderr=subprocess.STDOUT, shell=True,
universal_newlines=True) universal_newlines=True)
pf = ".." pf = ".."
else: else:
x = subprocess.check_output( x = subprocess.check_output(
["cd " + root + " && " + ["cd " + root + " && " +
"exec " + prog + " -r " + fn], "exec " + prog + " " + fn],
stderr=subprocess.STDOUT, shell=True, stderr=subprocess.STDOUT, shell=True,
universal_newlines=True) universal_newlines=True)
pf = "" pf = ""
...@@ -122,7 +122,7 @@ def run_gcov(prog, subdir): ...@@ -122,7 +122,7 @@ def run_gcov(prog, subdir):
ln = ln.split() ln = ln.split()
if not ln: if not ln:
continue continue
if ln[0] == "Creating": if ln[0].find("reating") != -1:
gn = ln[1].strip("'") gn = ln[1].strip("'")
assert gn[-5:] == ".gcov" assert gn[-5:] == ".gcov"
sn = gn[:-5] sn = gn[:-5]
...@@ -178,7 +178,7 @@ if __name__ == "__main__": ...@@ -178,7 +178,7 @@ if __name__ == "__main__":
optlist, args = getopt.getopt(sys.argv[1:], "g:o:x:") optlist, args = getopt.getopt(sys.argv[1:], "g:o:x:")
fo = sys.stdout fo = sys.stdout
gcovprog = "gcov6" gcovprog = "gcov6 -r"
for f, v in optlist: for f, v in optlist:
if f == '-o' and v == '-': if f == '-o' and v == '-':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment