Merge branch 'topic/422-2' into 'master'

gnatcheck: fix issues introduced in !383

See merge request eng/libadalang/langkit-query-language!389

Author: thvnx

lkql_checker/src/gnatcheck-diagnoses.adb

@@ -2629,8 +2629,7 @@ package body Gnatcheck.Diagnoses is
          User_Info_File_Full_Path := new String'
            (GNAT.OS_Lib.Normalize_Pathname
               (Fname,
-               Resolve_Links  => False,
-               Case_Sensitive => False));
+               Resolve_Links  => False));
       else
          Error (Fname & " not found, --include-file option ignored");
       end if;

lkql_jit/language/src/main/java/com/adacore/lkql_jit/checker/built_ins/NodeCheckerFunction.java

@@ -110,8 +110,7 @@ public Object alwaysTrue(VirtualFrame frame, Libadalang.AdaNode root) {
                                     CheckerUtils.MessageKind.ERROR,
                                     e.getMessage(),
                                     new LalLocationWrapper(currentNode, context.linesCache),
-                                    new SourceSectionWrapper(this.callNode.getSourceSection()),
-                                    rootUnit.getFileName(true));
+                                    new SourceSectionWrapper(this.callNode.getSourceSection()));
                     continue;
                 }
 

testsuite/drivers/gnatcheck_driver.py

@@ -519,7 +519,8 @@ def run_one_test(test_data: dict[str, any]) -> None:
 
     @property
     def output_refiners(self) -> list[OutputRefiner]:
-        result = super().output_refiners + [ReplacePath(self.working_dir())]
+        result = super().output_refiners
+        result.append(Substitute(self.working_dir(), "<working-dir>"))
         if self.test_env.get("canonicalize_backslashes", False):
             result.append(Substitute("\\", "/"))
         return result

testsuite/tests/gnatcheck/target/linux/test.out

@@ -1,23 +1,23 @@
 With target in project file
 ===========================
 
-<gnatcheck_worker_exe> -Pwith_target.gpr --target=x86_64-linux -d --files-from=/gnatcheck/gnatcheck-files1.TMP --rules-from=/gnatcheck/gnatcheck-rules0.TMP
+<gnatcheck_worker_exe> -Pwith_target.gpr --target=x86_64-linux -d --files-from=<working-dir>/gnatcheck/gnatcheck-files1.TMP --rules-from=<working-dir>/gnatcheck/gnatcheck-rules0.TMP
 main.adb:3:04: goto statement
 
 With target in config file
 ==========================
 
-<gnatcheck_worker_exe> -Pwithout_target.gpr --target=x86_64-linux -d --files-from=/gnatcheck/gnatcheck-files1.TMP --rules-from=/gnatcheck/gnatcheck-rules0.TMP
+<gnatcheck_worker_exe> -Pwithout_target.gpr --target=x86_64-linux -d --files-from=<working-dir>/gnatcheck/gnatcheck-files1.TMP --rules-from=<working-dir>/gnatcheck/gnatcheck-rules0.TMP
 main.adb:3:04: goto statement
 
 With target through command-line
 ================================
 
-<gnatcheck_worker_exe> -Pwithout_target.gpr --target=x86_64-linux -d --files-from=/gnatcheck/gnatcheck-files1.TMP --rules-from=/gnatcheck/gnatcheck-rules0.TMP
+<gnatcheck_worker_exe> -Pwithout_target.gpr --target=x86_64-linux -d --files-from=<working-dir>/gnatcheck/gnatcheck-files1.TMP --rules-from=<working-dir>/gnatcheck/gnatcheck-rules0.TMP
 main.adb:3:04: goto statement
 
 Without any target specified
 ============================
 
-<gnatcheck_worker_exe> -Pwithout_target.gpr --target=x86_64-linux -d --files-from=/gnatcheck/gnatcheck-files1.TMP --rules-from=/gnatcheck/gnatcheck-rules0.TMP
+<gnatcheck_worker_exe> -Pwithout_target.gpr --target=x86_64-linux -d --files-from=<working-dir>/gnatcheck/gnatcheck-files1.TMP --rules-from=<working-dir>/gnatcheck/gnatcheck-rules0.TMP
 main.adb:3:04: goto statement

testsuite/tests/gnatcheck_errors/generic_inst_walking/test.out

@@ -32,6 +32,6 @@ Total gnatcheck failures: 1
 
 6. Gnatcheck internal errors
 
-test.adb:2:04: error: internal issue at checker.lkql:4:22: test.adb:2:4-2:28: dereferencing a null access [/test.adb]
+<working-dir>/test.adb:2:04: error: internal issue at checker.lkql:4:22: test.adb:2:4-2:28: dereferencing a null access
 
 >>>program returned status code 2

testsuite/tests/gnatcheck_errors/generic_inst_walking/test.yaml

@@ -1,4 +1,6 @@
 driver: gnatcheck
 project: prj.gpr
+extra_args: ['-l']
 rules:
   - +Rderiving_from_predefined_type
+canonicalize_backslashes: True

testsuite/tests/gnatcheck_errors/missing_source_dirs/linux/test.out

@@ -1,3 +1,3 @@
-prj.gpr:2:26: error: "/invalid_source_dirs" is not a valid directory
+prj.gpr:2:26: error: "<working-dir>/invalid_source_dirs" is not a valid directory
 try "gnatcheck --help" for more information.
 >>>program returned status code 2

testsuite/tests/gnatcheck_errors/missing_source_dirs/windows/test.out

@@ -1,3 +1,3 @@
-prj.gpr:2:26: error: "\invalid_source_dirs" is not a valid directory
+prj.gpr:2:26: error: "<working-dir>\invalid_source_dirs" is not a valid directory
 try "gnatcheck --help" for more information.
 >>>program returned status code 2