[integrated-instrumentation] normalize paths for files of interest

gnatcov used to leave paths passed to the --files switch un-normalized,
which resulted in some units of interest being ignored at
instrumentation time.

Author: Jugst3r

testsuite/tests/integrated_instrumentation/basic_cmake/CMakeLists.txt

@@ -0,0 +1,4 @@
+project(HelloWorld)
+cmake_minimum_required(VERSION 3.0)
+
+add_executable(hello_world main.c)

testsuite/tests/integrated_instrumentation/basic_cmake/main.c

@@ -0,0 +1,8 @@
+#include <stdio.h>
+
+int
+main()
+{
+  printf("Hello world!\n");
+  return 0;
+}

testsuite/tests/integrated_instrumentation/basic_cmake/test.py

@@ -0,0 +1,51 @@
+"""
+Regression test: gnatcov used to leave paths passed to the --files switch
+un-normalized, which resulted in some units of interest being ignored at
+instrumentation time.
+"""
+
+import os
+import os.path
+
+from SUITE.control import env
+from SUITE.cutils import Wdir
+from SCOV.minicheck import check_xcov_reports
+from SUITE.tutils import cmdrun, srctracename_for, thistest, xcov
+
+Wdir("tmp_")
+
+cwd = os.getcwd()
+
+# Setup the instrumentation process
+xcov(
+    [
+        "setup-integration",
+        f"--files={os.path.join(cwd, '..', 'main.c')}",
+        "--compilers=gcc",
+    ]
+)
+
+# Shadow the compiler driver with the generated wrapper
+env.add_search_path(env_var="PATH", path=cwd)
+
+# Then, run the build process unchanged
+compiler_wrapper = os.path.join(cwd, 'gcc')
+cmdrun(["cmake", "..", f"-DCMAKE_C_COMPILER={compiler_wrapper}"], for_pgm=False)
+cmdrun(["make"], for_pgm=False)
+
+# Run the executable
+cmdrun(["hello_world"], for_pgm=False)
+
+# Check coverage expectations
+xcov(
+    [
+        "coverage",
+        "--level=stmt",
+        "--sid=main.c.sid",
+        "-axcov",
+        srctracename_for("main"),
+    ]
+)
+check_xcov_reports("*.xcov", {"main.c.xcov": {"+": {6, 7}}})
+
+thistest.result()

tools/gnatcov/gnatcov_bits_specific.adb

@@ -29,6 +29,8 @@ with GNAT.OS_Lib;
 with GNAT.Regexp;
 with GNAT.Strings; use GNAT.Strings;
 
+with GNATCOLL.VFS;
+
 with System.Multiprocessors;
 
 with Snames;
@@ -112,7 +114,7 @@ procedure GNATcov_Bits_Specific is
    Compiler_Drivers     : Inputs.Inputs_Type;
    Source_Rebase_Inputs : Inputs.Inputs_Type;
    Source_Search_Inputs : Inputs.Inputs_Type;
-   Subprograms_Inputs    : Inputs.Inputs_Type;
+   Subprograms_Inputs   : Inputs.Inputs_Type;
    Text_Start           : Pc_Type := 0;
    Output               : String_Access := null;
    Tag                  : String_Access := null;
@@ -566,7 +568,16 @@ procedure GNATcov_Bits_Specific is
       Copy_Arg_List (Opt_Ignore_Source_Files, Ignored_Source_Files);
       Copy_Arg_List (Opt_Files, Files_Of_Interest);
       Copy_Arg_List (Opt_Compiler_Wrappers, Compiler_Drivers);
-      Switches.Files_Of_Interest := To_String_Set (Files_Of_Interest);
+
+      for File of Files_Of_Interest loop
+         declare
+            use GNATCOLL.VFS;
+            F : constant Virtual_File := Create (+File.Name.all);
+         begin
+            F.Normalize_Path;
+            Switches.Files_Of_Interest.Include (+(+Full_Name (F)));
+         end;
+      end loop;
 
       --  Compute the languages for which we want coverage analysis, or enable
       --  just the default ones.