r47263 - merge from branch

Author: hawkowl
Date: Sat Apr 16 06:32:08 2016
New Revision: 47263

Added:
   branches/cov-subprocess-8266/admin/_copy.py
   branches/cov-subprocess-8266/admin/zz_coverage.pth
   branches/cov-subprocess-8266/twisted/topfiles/8266.misc
Modified:
   branches/cov-subprocess-8266/.coveragerc
   branches/cov-subprocess-8266/.gitignore
   branches/cov-subprocess-8266/tox.ini

Log:
merge from branch

Modified: branches/cov-subprocess-8266/.coveragerc
==============================================================================
--- branches/cov-subprocess-8266/.coveragerc	(original)
+++ branches/cov-subprocess-8266/.coveragerc	Sat Apr 16 06:32:08 2016
@@ -1,6 +1,15 @@
 [run]
-source = twisted
 branch = True
+parallel = True
+include =
+   */twisted/*
+   twisted/*
+
+[paths]
+source=
+   twisted
+   build/*/lib/python*/site-packages/twisted
+   build/pypy*/site-packages/twisted
 
 [report]
 precision = 2

Modified: branches/cov-subprocess-8266/.gitignore
==============================================================================
--- branches/cov-subprocess-8266/.gitignore	(original)
+++ branches/cov-subprocess-8266/.gitignore	Sat Apr 16 06:32:08 2016
@@ -10,7 +10,7 @@
 dist/
 venv/
 htmlcov/
-.coverage
+.coverage*
 *~
 *.lock
 apidocs/

Modified: branches/cov-subprocess-8266/tox.ini
==============================================================================
--- branches/cov-subprocess-8266/tox.ini	(original)
+++ branches/cov-subprocess-8266/tox.ini	Sat Apr 16 06:32:08 2016
@@ -36,6 +36,8 @@
      ; Documentation
      apidocs: pydoctor
      narrativedocs: sphinx
+setenv =
+   COVERAGE_PROCESS_START = {toxinidir}/.coveragerc
 
 commands =
     {tests,nomodules}: {envbindir}/trial --reactor={env:TWISTED_REACTOR:default} {posargs:twisted}
@@ -46,9 +48,11 @@
     apidocs: {toxinidir}/bin/admin/build-apidocs {toxinidir} apidocs
     narrativedocs: sphinx-build -aW -b html -d {toxinidir}/docs/_build {toxinidir}/docs {toxinidir}/docs/_build/
 
+    coverage: python {toxinidir}/admin/_copy.py {toxinidir}/admin/zz_coverage.pth {envsitepackagesdir}/zz_coverage.pth
     coverage: coverage erase
-    coverage: coverage run --rcfile={toxinidir}/.coveragerc {envbindir}/trial --reactor={env:TWISTED_REACTOR:default} {posargs:twisted}
-    coverage: coverage report --rcfile={toxinidir}/.coveragerc
+    coverage: coverage run -p --rcfile={toxinidir}/.coveragerc {envbindir}/trial --reactor={env:TWISTED_REACTOR:default} {posargs:twisted}
+    coverage: python {toxinidir}/admin/_copy.py "_trial_temp/.coverage*" {toxinidir}
+    coverage: python {toxinidir}/admin/_copy.py ".coverage*" {toxinidir}
 
 [testenv:twistedchecker]
 basepython=python2.7