Testsuite: Allow altruns to specify an alternate builder

The altrun mechanism allows to specify alternate programs for all the
"gnatcov <command>" commands. To be able to support CCG, we also need
to be able to override which builder is used.

This change adds the possibility to specify an overriding program for
gprbuild.

Note that gprbuild still needs to be present on path, as it will be used
when dumping version information, and to build the support library, as
this is done through a Makefile out of the testsuite's control.

Author: leocreuse

testsuite/SUITE/context.py

@@ -459,6 +459,12 @@ def suite_covpgm_for(self, cmd):
         """
         return getattr(thistest.options, 'gnatcov_%s' % cmd, None)
 
+    def suite_gprpgm_for(self, pgm):
+        """
+        Alternate program to launch in lieu of "gpr<tool>",
+        """
+        return getattr(thistest.options, pgm, None)
+
     def support_dir(self):
         return os.path.join(ROOT_DIR, 'support')
 

testsuite/SUITE/control.py

@@ -384,16 +384,19 @@ def gnatcov_info():
                      ('pre', 'testcase'),
                      ('post', 'testcase'))
 
+# Allowed alternatives for the --gpr<tool> family of command line options
+ALTRUN_GPR = ('gprbuild', )
 
-def altrun_opt_for(p0, p1):
+
+def altrun_opt_for(p0, p1=None):
     """Name of the command line option controlling the ALTRUN (P0, P1) pair."""
-    return "%s_%s" % (p0, p1)
+    return "%s_%s" % (p0, p1) if p1 else p0
 
 
-def altrun_attr_for(p0, p1):
+def altrun_attr_for(p0, p1=None):
     """Name of our internal controlling options attribute for the
     ALTRUN (P0, P1) pair."""
-    return "%s_%s" % (p0, p1)
+    return "%s_%s" % (p0, p1) if p1 else p0
 
 
 def cargs_opt_for(lang):
@@ -422,6 +425,14 @@ def add_shared_options_to(parser, toplevel):
             metavar="CMD",
             help='Use CMD instead of "%s %s"' % (pgm, cmd))
 
+    # --gpr<tool> family
+    for pgm in ALTRUN_GPR:
+        parser.add_argument(
+            f'--{altrun_opt_for(pgm)}', dest=altrun_attr_for(pgm),
+            metavar="CMD",
+            help=f'use CMD instead of "{pgm}"'
+        )
+
     # Valgrind control
     parser.add_argument(
         '--enable-valgrind', dest='enable_valgrind',

testsuite/SUITE/tutils.py

@@ -291,7 +291,12 @@ def gprbuild(project,
     # Now cleanup, do build and check status
     thistest.cleanup(project)
 
-    args = (to_list(BUILDER.BASE_COMMAND) +
+    builder = thistest.suite_gprpgm_for(os.path.basename(BUILDER.BASE_COMMAND))
+
+    if builder is None:
+        builder = BUILDER.BASE_COMMAND
+
+    args = (to_list(builder) +
             ['-P%s' % project] + all_gargs + all_cargs + all_largs)
     p = run_and_log(args, output=out, timeout=thistest.options.timeout)
     if register_failure:

testsuite/testsuite.py

@@ -579,6 +579,15 @@ def set_up(self):
                 'opt': altrun_opt_for(pgm, cmd),
                 'val': getattr(mopt, altrun_attr_for(pgm, cmd))})
 
+        # --gpr<tool> family
+        for pgm in control.ALTRUN_GPR:
+            if getattr(mopt, altrun_attr_for(pgm)) is None:
+                continue
+            testcase_cmd.append(
+                f"--{altrun_opt_for(pgm)}="
+                f"{getattr(mopt, altrun_attr_for(pgm))}"
+            )
+
         # --cargs family
 
         for lang in [None] + control.KNOWN_LANGUAGES:
@@ -1480,7 +1489,9 @@ def _resolve_paths(self):
             ["kernel", "altrun"] +
             [altrun_attr_for(p0, p1)
              for p0, p1 in (control.ALTRUN_HOOK_PAIRS
-                            + control.ALTRUN_GNATCOV_PAIRS)])
+                            + control.ALTRUN_GNATCOV_PAIRS)] +
+            [altrun_attr_for(p0) for p0 in control.ALTRUN_GPR]
+        )
 
         for attr in attributes_to_resolve:
             current_value = getattr(self.main.args, attr)
@@ -1582,7 +1593,7 @@ def _setup_altrun_hooks(self):
         self.maybe_exec(
             bin=self._bin_for("setup", indir=ctldir), edir=ctldir)
 
-        def install_altrun_for(p0, p1, binbase):
+        def install_altrun_for(p0, p1=None, binbase=None):
             """Establish an implicit value for the --P0_P1 command line option
             if we find a matching binary program in the altrun subdir we are
             processing. BINBASE provides the binary base name to use."""
@@ -1614,6 +1625,10 @@ def install_altrun_for(p0, p1, binbase):
         for pgm, cmd in control.ALTRUN_GNATCOV_PAIRS:
             install_altrun_for(p0=pgm, p1=cmd, binbase="c%s" % cmd)
 
+        # For the gpr<tool> replacements, map on binaries called cgpr<tool>:
+        for pgm in control.ALTRUN_GPR:
+            install_altrun_for(p0=pgm, p1=None, binbase=f"c{pgm}")
+
 
 if __name__ == "__main__":
     sys.exit(TestSuite().testsuite_main())