From b892fd503ae46f7f98db172e77d8f84cc63289a5 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Sun, 7 Oct 2018 11:18:09 -0400
Subject: All-in on contexts for ourselves

---
 igor.py     | 2 ++
 metacov.ini | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/igor.py b/igor.py
index 4731b8c5..36025c44 100644
--- a/igor.py
+++ b/igor.py
@@ -118,6 +118,7 @@ def run_tests_with_coverage(tracer, *runner_args):
         version += "_%s%s" % sys.pypy_version_info[:2]
     suffix = "%s%s_%s_%s" % (impl, version, tracer, platform.platform())
 
+    os.environ['COVERAGE_PYVERSION'] = version
     os.environ['COVERAGE_METAFILE'] = os.path.abspath(".metacov."+suffix)
 
     import coverage
@@ -159,6 +160,7 @@ def do_combine_html():
     """Combine data from a meta-coverage run, and make the HTML and XML reports."""
     import coverage
     os.environ['COVERAGE_HOME'] = os.getcwd()
+    os.environ['COVERAGE_PYVERSION'] = ''
     os.environ['COVERAGE_METAFILE'] = os.path.abspath(".metacov")
     cov = coverage.Coverage(config_file="metacov.ini")
     cov.load()
diff --git a/metacov.ini b/metacov.ini
index 50ea524d..fc85f26e 100644
--- a/metacov.ini
+++ b/metacov.ini
@@ -4,11 +4,13 @@
 # Settings to use when using coverage.py to measure itself.
 [run]
 branch = true
-data_file = $COVERAGE_METAFILE
+data_file = ${COVERAGE_METAFILE?}
 parallel = true
 source =
-    $COVERAGE_HOME/coverage
-    $COVERAGE_HOME/tests
+    ${COVERAGE_HOME?}/coverage
+    ${COVERAGE_HOME?}/tests
+context = ${COVERAGE_PYVERSION?}
+dynamic_context = test_function
 
 [report]
 # We set a different pragma so our code won't be confused with test code.
-- 
cgit v1.2.1