update Makefile and coverage2el.py to coverage-3.4

It might still work with coverage-3.3 if you run with COVERAGE_OMIT=""
This commit is contained in:
Brian Warner 2010-11-25 12:38:32 -08:00
parent 3acbf8818c
commit 1f0e2574cc
2 changed files with 14 additions and 2 deletions

View File

@ -132,6 +132,8 @@ quicktest-coverage:
$(PYTHON) misc/build_helpers/run-with-pythonpath.py trial --reporter=bwverbose-coverage $(TEST)
# on my laptop, "quicktest" takes 239s, "quicktest-coverage" takes 304s
# --include appeared in coverage-3.4
COVERAGE_OMIT=--include '$(CURDIR)/src/allmydata/*' --omit '$(CURDIR)/src/allmydata/test/*'
coverage-output:
rm -rf coverage-html
coverage html -i -d coverage-html $(COVERAGE_OMIT)

View File

@ -1,10 +1,20 @@
import os.path
from coverage import coverage, summary, misc
class ElispReporter(summary.SummaryReporter):
def report(self):
self.find_code_units(None, ["/System", "/Library", "/usr/lib",
"support/lib", "src/allmydata/test"])
try:
# coverage-3.4 has both omit= and include= . include= is applied
# first, then omit= removes items from what's left. These are
# tested with fnmatch, against fully-qualified filenames.
self.find_code_units(None,
omit=[os.path.abspath("src/allmydata/test/*")],
include=[os.path.abspath("src/allmydata/*")])
except TypeError:
# coverage-3.3 only had omit=
self.find_code_units(None, ["/System", "/Library", "/usr/lib",
"support/lib", "src/allmydata/test"])
out = open(".coverage.el", "w")
out.write("""