Always use target defined by the provided GPR file

Author: HugoGGuerrier

lkql_checker/src/gnatcheck-projects.adb

@@ -589,6 +589,7 @@ package body Gnatcheck.Projects is
          raise Parameter_Error;
       end if;
 
+      --  Use the runtime path provided through the project file
       if RTS_Path = Null_Unbounded_String
         and then My_Project.Tree.Runtime (Ada_Language) /= ""
       then
@@ -597,6 +598,11 @@ package body Gnatcheck.Projects is
              (String (My_Project.Tree.Runtime (Ada_Language)));
       end if;
 
+      --  Use the target specified through the project file or the config file
+      if Target = Null_Unbounded_String then
+         Target := To_Unbounded_String (String (My_Project.Tree.Target));
+      end if;
+
       if Load_Sources then
          if My_Project.Tree.Root_Project.Kind = K_Aggregate then
             --  We cannot load sources when the number of aggregated projects
@@ -607,7 +613,6 @@ package body Gnatcheck.Projects is
             Gnatcheck.Projects.Aggregate.Collect_Aggregated_Projects
               (My_Project.Tree);
 
-            Target := To_Unbounded_String (String (My_Project.Tree.Target));
          end if;
 
          if not My_Project.Tree.Update_Sources then

testsuite/drivers/gnatcheck_driver.py

@@ -129,11 +129,16 @@ class GnatcheckDriver(BaseDriver):
         - ``worker``: Provide a custom worker for the GNATcheck run.
         - ``gnatkp_autoconfig`` (bool): Whether to automatically configure the
           target and runtime when running in "gnatkp" mode. Default is True.
+        - ``auto_codepeer_target`` (bool): Whether to automatically add the
+          codepeer target when the test is run in CodePeer mode. Default is
+          True.
         - ``in_tty`` (bool): Whether to run GNATcheck in a pseudo TTY using the
           ``pty`` Python module.
 
         - ``jobs`` (int): The number of jobs to forward to the GNATcheck command.
         - ``project`` (str): GPR build file to use (if any).
+        - ``target`` (str): The target to forward to LibGPR for project
+          resolution.
         - ``subdirs`` (str): The directory to forward to GNATcheck `--subdirs`
           option.
         - ``input_sources`` (list[str]): Ada files to analyze (if explicit,
@@ -166,6 +171,8 @@ class GnatcheckDriver(BaseDriver):
         - ``extra_rule_options`` (list[str]): Extra arguments for the rules
           section.
 
+        - ``canonicalize_worker`` (bool): Whether to replace the GNATcheck worker
+          name by a constant string in then test output. Default is True.
         - ``pre_python``/``post_python`` (str): Python code to be executed
           before/after the test.
         - ``list_dirs`` (list[str]): A list of directories to display the content
@@ -296,15 +303,24 @@ def run_one_test(test_data: dict[str, any]) -> None:
             if pre_python:
                 capture_exec_python(pre_python)
 
-            # If the executable is gantkp, we must provide an explicit runtime
+            # Set the target if one has been provided
+            if test_data.get('target'):
+                args.append(f"--target={test_data['target']}")
+
+            # If the executable is gnatkp, we must provide an explicit runtime
             # and target
             if exe == "gnatkp" and test_data.get('gnatkp_autoconfig', True):
-                if not self.is_codepeer:
+                if not self.is_codepeer and not test_data.get('target'):
                     args.append(f"--target={self.env.host.triplet}")
                 args.append("--RTS=default")
 
-            # Set the codepeer target if needed
-            if self.is_codepeer:
+            # Set the codepeer target if needed and no other one has been
+            # provided.
+            if (
+                self.is_codepeer and
+                test_data.get('auto_codepeer_target', True)
+                and not test_data.get('target')
+            ):
                 args.append("--target=codepeer")
 
             # Set the "--show-rule" flag according to the test
@@ -415,6 +431,16 @@ def run_one_test(test_data: dict[str, any]) -> None:
                     exec_output = p.out
                     status_code = p.status
 
+                # If required, canonicalize gnatcheck worker name in the output
+                if test_data.get('canonicalize_worker', True):
+                    worker = " ".join(
+                        [
+                            P.basename(self.gnatcheck_worker_exe[0]),
+                            *self.gnatcheck_worker_exe[1:],
+                        ]
+                    )
+                    exec_output = exec_output.replace(worker, "<gnatcheck_worker_exe>")
+
                 # Then read GNATcheck report file if there is one
                 report_file_content = ""
                 parse_output_for_flags = True

testsuite/tests/gnatcheck/gpr_config_file/config.cgpr

@@ -1,7 +1,3 @@
---  This gpr configuration file was generated by gprconfig
---  using this command line:
---  gprconfig prj.gpr
---  from /home/guerrier/Documents/AdaCore/test/
 configuration project Default is
    for Default_Language use "Ada";
    for Runtime_Dir       ("Ada") use "dir";

testsuite/tests/gnatcheck/target/codepeer/config.cgpr

@@ -0,0 +1,25 @@
+configuration project Default is
+   for Default_Language use "Ada";
+   for Runtime_Dir       ("Ada") use "dir";
+   for Target use "x86_64-linux";
+
+   package Naming is
+      for Spec_Suffix ("Ada") use ".ads";
+      for Body_Suffix ("Ada") use ".adb";
+
+      for Body_Suffix ("Asm") use ".s";
+      for Body_Suffix ("Asm2") use ".asm";
+      for Body_Suffix ("Asm_Cpp") use ".S";
+
+      for Body_Suffix ("C") use ".c";
+      for Spec_Suffix ("C") use ".h";
+
+      for Spec_Suffix ("C++") use ".hh";
+      for Body_Suffix ("C++") use ".cpp";
+
+      for Body_Suffix ("Fortran") use ".f";
+
+      for Casing use "lowercase";
+      for Dot_Replacement use "-";
+   end Naming;
+end Default;

testsuite/tests/gnatcheck/target/codepeer/main.adb

@@ -0,0 +1,5 @@
+procedure Main is
+begin
+   goto Lbl;  --  FLAG (3)
+   <<Lbl>>
+end Main;

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

@@ -0,0 +1,34 @@
+With target in project file and no other target
+===============================================
+
+gnatcheck: kb: warning: can't find a toolchain for the following configuration: language 'Ada', target 'x86_64-linux', default runtime
+gnatcheck: "with_target.gpr" processing failed
+try "gnatcheck --help" for more information.
+>>>program returned status code 2
+
+With target in project file and the codepeer target in command-line
+===================================================================
+
+<gnatcheck_worker_exe> -Pwith_target.gpr --target=codepeer -d --files-from=/gnatcheck/gnatcheck-files1.TMP --rules-from=/gnatcheck/gnatcheck-rules0.TMP
+main.adb:3:04: goto statement
+
+With target in config file
+==========================
+
+gnatcheck: config.cgpr:4:19: error: --target: 'codepeer' is different from the target value in the configuration project 'x86_64-linux'
+<gnatcheck_worker_exe> -Pwithout_target.gpr --target=codepeer -d --files-from=/gnatcheck/gnatcheck-files1.TMP --rules-from=/gnatcheck/gnatcheck-rules0.TMP
+main.adb:3:04: goto statement
+
+With target through command-line
+================================
+
+gnatcheck: kb: warning: can't find a toolchain for the following configuration: language 'Ada', target 'x86_64-linux', default runtime
+gnatcheck: "without_target.gpr" processing failed
+try "gnatcheck --help" for more information.
+>>>program returned status code 2
+
+Without any target specified
+============================
+
+<gnatcheck_worker_exe> -Pwithout_target.gpr --target=codepeer -d --files-from=/gnatcheck/gnatcheck-files1.TMP --rules-from=/gnatcheck/gnatcheck-rules0.TMP
+main.adb:3:04: goto statement

testsuite/tests/gnatcheck/target/codepeer/test.yaml

@@ -0,0 +1,25 @@
+driver: gnatcheck
+control:
+  - [SKIP,
+     "os == 'windows' or not is_codepeer",
+     "This test must be run with Codepeer on Linux"]
+format: brief
+extra_args:
+  - -d
+rules:
+  - +RGoto_Statements
+tests:
+  - label: With target in project file and no other target
+    project: with_target.gpr
+    auto_codepeer_target: False
+  - label: With target in project file and the codepeer target in command-line
+    project: with_target.gpr
+    auto_codepeer_target: True
+  - label: With target in config file
+    project: without_target.gpr
+    gpr_config_file: config.cgpr
+  - label: With target through command-line
+    project: without_target.gpr
+    target: x86_64-linux
+  - label: Without any target specified
+    project: without_target.gpr

testsuite/tests/gnatcheck/target/codepeer/with_target.gpr

@@ -0,0 +1,3 @@
+project With_Target is
+   for Target use "x86_64-linux";
+end With_Target;

testsuite/tests/gnatcheck/target/codepeer/without_target.gpr

@@ -0,0 +1,2 @@
+project Without_Target is
+end Without_Target;

testsuite/tests/gnatcheck/target/linux/config.cgpr

@@ -0,0 +1,25 @@
+configuration project Default is
+   for Default_Language use "Ada";
+   for Runtime_Dir       ("Ada") use "dir";
+   for Target use "x86_64-linux";
+
+   package Naming is
+      for Spec_Suffix ("Ada") use ".ads";
+      for Body_Suffix ("Ada") use ".adb";
+
+      for Body_Suffix ("Asm") use ".s";
+      for Body_Suffix ("Asm2") use ".asm";
+      for Body_Suffix ("Asm_Cpp") use ".S";
+
+      for Body_Suffix ("C") use ".c";
+      for Spec_Suffix ("C") use ".h";
+
+      for Spec_Suffix ("C++") use ".hh";
+      for Body_Suffix ("C++") use ".cpp";
+
+      for Body_Suffix ("Fortran") use ".f";
+
+      for Casing use "lowercase";
+      for Dot_Replacement use "-";
+   end Naming;
+end Default;