move source to .coveragerc file

Author: BurnzZ

python/private/python_bootstrap_template.txt

@@ -425,22 +425,22 @@ def _RunForCoverage(python_program, main_filename, args, env,
         directory under the runfiles tree, and will recursively delete the
         runfiles directory if set.
   """
+  instrumented_files = [abs_path for abs_path, _ in InstrumentedFilePaths()]
+  unique_dirs = {os.path.dirname(file) for file in instrumented_files}
+
+  PrintVerboseCoverage("[coveragepy] Instrumented Files:\n" + "\n".join(instrumented_files))
+  PrintVerboseCoverage("[coveragepy] Sources:\n" + "\n".join(unique_dirs))
+
   # We need for coveragepy to use relative paths.  This can only be configured
   unique_id = uuid.uuid4()
   rcfile_name = os.path.join(os.environ['COVERAGE_DIR'], ".coveragerc_{}".format(unique_id))
   with open(rcfile_name, "w") as rcfile:
-    rcfile.write('''[run]
+    rcfile.write(f'''[run]
 relative_files = True
+source =
+\t{"\n\t".join(unique_dirs)}
 ''')
   PrintVerboseCoverage('Coverage entrypoint:', coverage_entrypoint)
-
-  instrumented_files = [abs_path for abs_path, _ in InstrumentedFilePaths()]
-  unique_dirs = {os.path.dirname(file) for file in instrumented_files}
-  source = ",".join(unique_dirs)
-
-  PrintVerboseCoverage("[coveragepy] Instrumented Files:\n" + "\n".join(instrumented_files))
-  PrintVerboseCoverage("[coveragepy] Sources:\n" + "\n".join(unique_dirs))
-
   # First run the target Python file via coveragepy to create a .coverage
   # database file, from which we can later export lcov.
   ret_code = subprocess.call(
@@ -451,7 +451,6 @@ relative_files = True
       "--rcfile=" + rcfile_name,
       "--append",
       "--branch",
-      "--source=" + source,
       main_filename
     ] + args,
     env=env,

python/private/stage2_bootstrap_template.py

@@ -276,6 +276,12 @@ def _maybe_collect_coverage(enable):
         yield
         return
 
+    instrumented_files = [abs_path for abs_path, _ in instrumented_file_paths()]
+    unique_dirs = {os.path.dirname(file) for file in instrumented_files}
+
+    print_verbose_coverage("Instrumented Files:\n" + "\n".join(instrumented_files))
+    print_verbose_coverage("Sources:\n" + "\n".join(unique_dirs))
+
     import uuid
 
     import coverage
@@ -289,18 +295,12 @@ def _maybe_collect_coverage(enable):
     print_verbose_coverage("coveragerc file:", rcfile_name)
     with open(rcfile_name, "w") as rcfile:
         rcfile.write(
-            """[run]
+            f"""[run]
 relative_files = True
+source =
+\t{"\n\t".join(unique_dirs)}
 """
         )
-
-    instrumented_files = [abs_path for abs_path, _ in instrumented_file_paths()]
-    unique_dirs = {os.path.dirname(file) for file in instrumented_files}
-    source = list(unique_dirs)
-
-    print_verbose_coverage("Instrumented Files:\n" + "\n".join(instrumented_files))
-    print_verbose_coverage("Sources:\n" + "\n".join(unique_dirs))
-
     try:
         cov = coverage.Coverage(
             config_file=rcfile_name,
@@ -322,7 +322,6 @@ def _maybe_collect_coverage(enable):
                 # see https://github.com/nedbat/coveragepy/blob/bfb0c708fdd8182b2a9f0fc403596693ef65e475/coverage/inorout.py#L153-L164
                 "*/external/*",
             ],
-            source=source,
         )
         cov.start()
         try: