summaryrefslogtreecommitdiff
path: root/coverage/control.py
diff options
context:
space:
mode:
authorChristine Lytwynec <chris.lytwynec@gmail.com>2015-04-21 11:28:13 -0400
committerChristine Lytwynec <chris.lytwynec@gmail.com>2015-04-21 11:28:13 -0400
commit7efd4f50062f750df145102fc07c87fc49599bbe (patch)
tree723c845d231e6ae7ef8013685758a1a52990f51c /coverage/control.py
parenta1c737c03dbb0c1dfee85d436ddcaeafc7a5dbfe (diff)
downloadpython-coveragepy-7efd4f50062f750df145102fc07c87fc49599bbe.tar.gz
Added ability to combine coverage data files from multiple directories into one file via command line args.
Diffstat (limited to 'coverage/control.py')
-rw-r--r--coverage/control.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/coverage/control.py b/coverage/control.py
index 563925e..4a9ac72 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -717,7 +717,7 @@ class Coverage(object):
self._harvest_data()
self.data.write(suffix=data_suffix)
- def combine(self):
+ def combine(self, data_dirs=None):
"""Combine together a number of similarly-named coverage data files.
All coverage data files whose name starts with `data_file` (from the
@@ -733,7 +733,7 @@ class Coverage(object):
result = paths[0]
for pattern in paths[1:]:
aliases.add(pattern, result)
- self.data.combine_parallel_data(aliases=aliases)
+ self.data.combine_parallel_data(aliases=aliases, data_dirs=data_dirs)
def _harvest_data(self):
"""Get the collected data and reset the collector.