diff options
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/cmdline.py | 7 | ||||
| -rw-r--r-- | coverage/control.py | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index e2b79fef..9ff39f44 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -274,7 +274,9 @@ CMDS = { 'combine': CmdOptionParser( "combine", - GLOBAL_ARGS, + [ + Opts.append, + ] + GLOBAL_ARGS, usage="<path1> <path2> ... <pathN>", description=( "Combine data from multiple coverage files collected " @@ -484,7 +486,8 @@ class CoverageScript(object): return self.do_run(options, args) elif options.action == "combine": - self.coverage.load() + if options.append: + self.coverage.load() data_dirs = args or None self.coverage.combine(data_dirs) self.coverage.save() diff --git a/coverage/control.py b/coverage/control.py index 2f2989cb..f350b3d1 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -247,6 +247,9 @@ class Coverage(object): if concurrency == "multiprocessing": patch_multiprocessing() concurrency = None + # Multi-processing uses parallel for the subprocesses, so also use + # it for the main process. + self.config.parallel = True self.collector = Collector( should_trace=self._should_trace, |