Bring emcoverage tool back to life. NFC (emscripten-core#13598)

sbc100 · web-flow · commit 16cffecd0ff5 · 2021-03-04T10:48:02.000-08:00
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,7 @@
+[run]
+source = .
+omit = ./tests/*
+       ./third_party/*
+       ./tools/emcoverage.py
+       test.py
+
diff --git a/.gitignore b/.gitignore
@@ -16,7 +16,8 @@
 /node_modules/
 
 # Python coverage tool output
-.coverage*
+.coverage
+.coverage.*
 tools/coverage/
 htmlcov/
 coverage.xml
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -6,3 +6,4 @@
 
 flake8==3.7.8
 flake8-unused-arguments==0.0.6
+coverage==5.5
diff --git a/tools/emcoverage.py b/tools/emcoverage.py
@@ -38,6 +38,8 @@
 
 import coverage.cmdline
 
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+
 
 def main():
   # We hack sys.executable to point to this file, which is executable via #! line.
@@ -46,8 +48,9 @@ def main():
   # all of them will execute under the watchful eye of emcoverage.py, and resulting
   # in their code coverage being tracked.
   sys.executable = os.path.abspath(__file__)
+  os.environ['EMSDK_PYTHON'] = sys.executable
 
-  store = os.path.join(os.path.dirname(sys.executable), 'coverage')
+  store = os.path.join(SCRIPT_DIR, 'coverage')
 
   if len(sys.argv) < 2 or sys.argv[1] == 'help':
     print(__doc__.replace('emcoverage.py', sys.argv[0]).strip())
@@ -64,7 +67,7 @@ def main():
       coverage.cmdline.main()
     except SystemExit:
       pass
-    sys.argv = old_argv
+    sys.argv = old_argv + ['-i']
     return coverage.cmdline.main()
 
   if not os.path.exists(sys.argv[1]):
@@ -78,7 +81,7 @@ def main():
     if e.errno != errno.EEXIST:
       raise
   os.environ['COVERAGE_FILE'] = os.path.join(store, str(uuid.uuid4()))
-  sys.argv[0:1] = ['coverage', 'run', '--parallel-mode', '--concurrency=multiprocessing', '--']
+  sys.argv[0:1] = ['coverage', 'run', '--parallel-mode', '--']
 
   return coverage.cmdline.main()
 

Original file line number	Diff line number	Diff line change
`@@ -6,3 +6,4 @@`
`6`	`6`
`7`	`7`	`flake8==3.7.8`
`8`	`8`	`flake8-unused-arguments==0.0.6`
	`9`	`+coverage==5.5`