Merge branch 'mr/backport/release-25.1-issue-eng/ide/libadalang-tools…

…_200' into '25.1'

[25.1] Backport of eng/ide/libadalang-tools#200

See merge request eng/ide/libadalang-tools!280

src/test-actions.adb

@@ -207,6 +207,14 @@ package body Test.Actions is
       Test.Common.Verbose := Arg (Cmd, Verbose);
       Test.Common.Quiet   := Arg (Cmd, Quiet);
 
+      --  If the tool project is an aggregate one, exit early and do nothing.
+      --  The aggregated projects will be processed in sequence in subprocess
+      --  calls made by the driver.
+
+      if Tool.Project_Tree.Root_Project.Is_Aggregate_Project then
+         return;
+      end if;
+
       Test.Common.Instrument := Arg (Cmd, Dump_Test_Inputs);
 
       if Arg (Cmd, Passed_Tests) /= null then
@@ -1007,6 +1015,14 @@ package body Test.Actions is
         Tool.Project_Tree.Root_Project.Project_Path.Display_Full_Name;
    begin
 
+      --  If the tool project is an aggregate one, exit early and do nothing.
+      --  The aggregated projects will be processed in sequence in subprocess
+      --  calls made by the driver.
+
+      if Tool.Project_Tree.Root_Project.Is_Aggregate_Project then
+         return;
+      end if;
+
       --  In any case, generate the support library if needed
 
       if Test.Common.Get_Lib_Support_Status in Test.Common.Needed then

testsuite/tests/test/200-aggregates/dep.gpr

@@ -0,0 +1,6 @@
+project Dep is
+
+   for Object_Dir use "obj_dep";
+   for Source_Dirs use ("src_dep");
+
+end Dep;

testsuite/tests/test/200-aggregates/prj.gpr

@@ -0,0 +1,3 @@
+aggregate project Prj is
+   for Project_Files use ("prj1.gpr", "prj2.gpr");
+end Prj;

testsuite/tests/test/200-aggregates/prj1.gpr

@@ -0,0 +1,8 @@
+with "dep.gpr";
+
+project Prj1 is
+
+   for Object_Dir use "obj1";
+   for Source_Dirs use ("src1");
+
+end Prj1;

testsuite/tests/test/200-aggregates/prj2.gpr

@@ -0,0 +1,8 @@
+with "dep.gpr";
+
+project Prj2 is
+
+   for Object_Dir use "obj2";
+   for Source_Dirs use ("src2");
+
+end Prj2;

testsuite/tests/test/200-aggregates/src1/pkg.adb

@@ -0,0 +1,7 @@
+with Dep;
+
+package body Pkg is
+
+   function Foo (X : Integer) return Integer is (Dep.Baz (X));
+
+end Pkg;

testsuite/tests/test/200-aggregates/src1/pkg.ads

@@ -0,0 +1,5 @@
+package Pkg is
+
+   function Foo (X : Integer) return Integer;
+
+end Pkg;

testsuite/tests/test/200-aggregates/src2/pkh.adb

@@ -0,0 +1,7 @@
+with Dep;
+
+package body Pkh is
+
+   function Bar (X : Integer) return Integer is (Dep.Baz (X));
+
+end Pkh;

testsuite/tests/test/200-aggregates/src2/pkh.ads

@@ -0,0 +1,5 @@
+package Pkh is
+
+   function Bar (X : Integer) return Integer;
+
+end Pkh;

testsuite/tests/test/200-aggregates/src_dep/dep.adb

@@ -0,0 +1,5 @@
+package body Dep is
+
+   function Baz (X : Integer) return Integer is (X);
+
+end Dep;

testsuite/tests/test/200-aggregates/src_dep/dep.ads

@@ -0,0 +1,5 @@
+package Dep is
+
+   function Baz (X : Integer) return Integer;
+
+end Dep;

testsuite/tests/test/200-aggregates/test.sh

@@ -0,0 +1,10 @@
+#! /bin/bash
+
+# First, run gnattest in stub mode, with tests placed in source subdirectories,
+# and stubs in the object dir of the stubbed project.
+gnattest -P prj.gpr --stub --subdirs=test --stubs-dir=stub -q
+
+# The build both test driver aggregate projects, to ensure the generated
+# harnesses are valid.
+gprbuild -q obj1/gnattest_stub/harness/test_drivers.gpr
+gprbuild -q obj2/gnattest_stub/harness/test_drivers.gpr

testsuite/tests/test/200-aggregates/test.yaml

@@ -0,0 +1,5 @@
+description:
+  Test that gnattest does not crash when processing an aggregate project,
+  and that they are processed in sequence, producing two valid harnesses.
+
+driver: shell_script