diff options
| author | Christine Lytwynec <chris.lytwynec@gmail.com> | 2015-04-21 11:28:13 -0400 |
|---|---|---|
| committer | Christine Lytwynec <chris.lytwynec@gmail.com> | 2015-04-21 11:28:13 -0400 |
| commit | 7efd4f50062f750df145102fc07c87fc49599bbe (patch) | |
| tree | 723c845d231e6ae7ef8013685758a1a52990f51c /coverage/cmdline.py | |
| parent | a1c737c03dbb0c1dfee85d436ddcaeafc7a5dbfe (diff) | |
| download | python-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/cmdline.py')
| -rw-r--r-- | coverage/cmdline.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index 2be3294..c611e03 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -249,7 +249,7 @@ CMDS = { ), 'combine': CmdOptionParser("combine", GLOBAL_ARGS, - usage = " ", + usage = "<dir1> <dir2> ... <dirN>", description = "Combine data from multiple coverage files collected " "with 'run -p'. The combined results are written to a single " "file representing the union of the data." @@ -430,7 +430,8 @@ class CoverageScript(object): self.do_run(options, args) if options.action == "combine": - self.coverage.combine() + data_dirs = argv if argv else None + self.coverage.combine(data_dirs) self.coverage.save() # Remaining actions are reporting, with some common options. |