Skip to content

Commit 21c7eec

Browse files
committed
use first directory only
1 parent c03263a commit 21c7eec

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

codecov/__init__.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,8 @@ def main(*argv, **kwargs):
481481
write('==> Processing gcov (disable by -X gcov)')
482482
if os.path.isdir(os.path.expanduser('~/Library/Developer/Xcode/DerivedData')):
483483
write(' Found OSX DerivedData')
484-
try_to_run("find ~/Library/Developer/Xcode/DerivedData -name '*.gcda' -exec gcov -pcbu -o $(find ~/Library/Developer/Xcode/DerivedData -type f -name '*.gcno' -exec dirname {} \;) {} +")
484+
_directory = try_to_run("find ~/Library/Developer/Xcode/DerivedData -type f -name '*.gcno' -exec dirname {} \; | head -1")
485+
try_to_run("find ~/Library/Developer/Xcode/DerivedData -name '*.gcda' -exec gcov -pcbu -o '%s' {} +" % _directory)
485486

486487
# xcode7
487488
profdata = try_to_run("find ~/Library/Developer/Xcode/DerivedData -name 'Coverage.profdata' | head -1")
@@ -493,10 +494,11 @@ def main(*argv, **kwargs):
493494
_proj = _file.split('/')[-2].split('.')[0]
494495
try_to_run('xcrun llvm-cov show -instr-profile "%s" "%s/%s" > "%s.coverage.txt"' % (profdata, _file, _proj, _type))
495496

496-
cmd = "find %s -type f -name '*.gcno' %s -exec gcov -pbcu -o $(find %s -type f -name '*.gcno' -exec dirname {} \;) {} +" % (
497-
codecov.gcov_root or root,
497+
_directory = try_to_run("find %s -type f -name '*.gcno' -exec dirname {} \;)" % (codecov.gcov_root or root))
498+
cmd = "find %s -type f -name '*.gcno' %s -exec gcov -pbcu -o %s {} +" % (
499+
(codecov.gcov_root or root),
498500
" ".join(map(lambda a: "-not -path '%s'" % a, codecov.gcov_glob)),
499-
codecov.gcov_root or root)
501+
_directory)
500502
write(' Executing gcov (%s)' % cmd)
501503
try_to_run(cmd)
502504

0 commit comments

Comments
 (0)