From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Wed, 16 Nov 2022 04:09:40 +0000 (-0800)
Subject: CI: modernize coverage script to use 'pathlib'
X-Git-Tag: 7.0.2~2^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=774ba41b04fc5296a252f92ed819c442b78baf14;p=graphviz

CI: modernize coverage script to use 'pathlib'
---

diff --git a/ci/test_coverage.py b/ci/test_coverage.py
index 232aeb514..cc3d0e984 100755
--- a/ci/test_coverage.py
+++ b/ci/test_coverage.py
@@ -4,9 +4,9 @@
 
 import argparse
 import logging
-import os
 import subprocess
 import sys
+from pathlib import Path
 from typing import List
 
 # logging output stream, setup in main()
@@ -34,15 +34,15 @@ def main(args: List[str]) -> int:  # pylint: disable=C0116
         "Must specify --init or --analyze; refusing to run")
     return -1
 
-  cwd = os.getcwd()
+  cwd = Path.cwd()
 
   generated_files = [
-      f"{cwd}/build/cmd/tools/gmlparse.c",
-      f"{cwd}/build/cmd/tools/gmlscan.c",
-      f"{cwd}/build/lib/cgraph/grammar.c",
-      f"{cwd}/build/lib/cgraph/scan.c",
-      f"{cwd}/build/lib/common/htmlparse.c",
-      f"{cwd}/build/lib/expr/y.tab.c",
+      cwd / "build/cmd/tools/gmlparse.c",
+      cwd / "build/cmd/tools/gmlscan.c",
+      cwd / "build/lib/cgraph/grammar.c",
+      cwd / "build/lib/cgraph/scan.c",
+      cwd / "build/lib/common/htmlparse.c",
+      cwd / "build/lib/expr/y.tab.c",
       ]
 
   excluded_files = generated_files
@@ -68,12 +68,12 @@ def main(args: List[str]) -> int:  # pylint: disable=C0116
         ["lcov", "--rc", "lcov_branch_coverage=1", "--add-tracefile",
          "app_base.info", "-add-tracefile", "app_test.info", "--output-file", "app_total.info"])
     # generate coverage html pages using lcov which are nicer than gcovr's
-    os.makedirs("coverage/lcov", exist_ok=True)
+    Path("coverage/lcov").mkdir(parents=True, exist_ok=True)
     subprocess.check_call(
         ["genhtml", "--prefix", cwd, "--rc", "lcov_branch_coverage=1",
          "--output-directory", "coverage/lcov", "--show-details", "app_total.info"])
     # generate coverage info for GitLab's Test Coverage Visualization
-    os.makedirs("coverage/gcovr", exist_ok=True)
+    Path("coverage/gcovr").mkdir(parents=True, exist_ok=True)
     subprocess.check_call(
         ["gcovr"] + exclude_options +
         ["--xml-pretty", "--html-details=coverage/gcovr/index.html",