Fix build path used to correct python coverage

rina-forks · Jul 22, 2024 · 5a5ab6a · 5a5ab6a
1 parent c67903d
commit 5a5ab6a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.ci/adjust-coverage-paths.py b/.ci/adjust-coverage-paths.py
@@ -42,14 +42,19 @@
 
 if args.source_dir is None:
     parser.error("either --source-dir or CI_PROJECT_DIR is required")
+args.source_dir = args.source_dir.resolve()
+
 if args.build_dir is None:
-    args.build_dir = args.coverage.parent.resolve()
+    args.build_dir = args.coverage.parent
+args.build_dir = args.build_dir.resolve()
 
 et = ElementTree.parse(args.coverage)
 for source in et.iter("source"):
     if source.text:
         relpath = Path(source.text).relative_to(args.build_dir)
-        source.text = str(Path(args.source_dir, relpath))
+        fixed = str(Path(args.source_dir, relpath))
+        print("mapping", source.text, "to", fixed)
+        source.text = fixed
 
 if args.output:
     et.write(args.output)

diff --git a/.ci/gitlab-ci.yml b/.ci/gitlab-ci.yml
@@ -244,7 +244,7 @@ report-coverage-py:
     - pip install coverage
     - cd build/python
     - coverage xml
-    - ../../.ci/adjust-coverage-paths.py --in-place coverage.xml
+    - ../../.ci/adjust-coverage-paths.py --in-place coverage.xml --build-dir ..
     - coverage report