Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage

(This used to be commit eff27744d3dcb4f6bcdf9bd03583bb38634c398d)

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index ee2d1e11da6a109db6012ce1d8b8ac838ff5271b..6f1086ad376c653087cb703a78dd61dd2e351c35 100755 (executable)
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -36,8 +36,6 @@ parser.add_option_group(credopts)
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))
-parser.add_option("--coverage", metavar="CACHE", type=str, 
-                         help="Store coverage data in CACHE")
 
 args = parser.parse_args()[1]
 
@@ -47,10 +45,4 @@ samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_l
 param.cvar.default_config = samba.tests.cmdline_loadparm
 
 runner = SubunitTestRunner()
-if opts.coverage is not None:
-       import coverage
-       coverage.use_cache(True, opts.coverage)
-       coverage.start()
 program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner)
-if opts.coverage:
-       coverage.stop()