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

…_208' into '25.1'

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

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

src/test-skeleton-source_table.adb

@@ -845,7 +845,13 @@ package body Test.Skeleton.Source_Table is
             Importing := P.Find_All_Projects_Importing (Direct_Only => True);
             Increase_Indent (Me, "importing projects:");
             while Current (Importing) /= No_Project loop
-               PR.Importing_List.Append (Current (Importing).Name);
+
+               --  Ensure to only reference the extending-most project, as
+               --  extended projects are skipped.
+
+               PR.Importing_List.Append
+                 (Current (Importing)
+                  .Extending_Project (Recurse => True).Name);
                Trace (Me, Current (Importing).Name);
                Next (Importing);
             end loop;

src/utils-projects.adb

@@ -118,6 +118,8 @@ package body Utils.Projects is
         and then Index (S, "not found") /= 0
       then
          return;
+      elsif Index (S, "warning:") /= 0 then
+         Err_Out.Put_Str (S);
       else
          Cmd_Error_No_Tool_Name (S);
       end if;

testsuite/tests/test/208-gpr-warnings/pkg.adb

@@ -0,0 +1,8 @@
+package body Pkg is
+
+   procedure Foo (X : in out Integer) is
+   begin
+      X := X + 1;
+   end Foo;
+
+end Pkg;

testsuite/tests/test/208-gpr-warnings/pkg.ads

@@ -0,0 +1,5 @@
+package Pkg is
+
+   procedure Foo (X : in out Integer);
+
+end Pkg;

testsuite/tests/test/208-gpr-warnings/prj.gpr

@@ -0,0 +1,11 @@
+library project Prj is
+    for Object_Dir use "obj";
+    for Library_Dir use "lib";
+    for Library_Name use "prj";
+
+    --  Add linker switches to trigger a gpr warning
+    package Linker is
+        for Default_Switches ("Ada") use ("-static-libstdc++");
+    end Linker;
+
+end Prj;

testsuite/tests/test/208-gpr-warnings/test.out

@@ -0,0 +1,3 @@
+prj.gpr:1:17: warning: Linker switches not taken into account in library projects
+Units remaining: 2     Units remaining: 1     
+prj.gpr:1:17: warning: Linker switches not taken into account in library projects

testsuite/tests/test/208-gpr-warnings/test.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+gnattest -P prj.gpr && gprbuild -q -P obj/gnattest/harness/test_driver.gpr

testsuite/tests/test/208-gpr-warnings/test.yaml

@@ -0,0 +1,6 @@
+description:
+  Test that gnattest does not exit with an error if there are warnings when
+  loading the project file. Instead, only output those warnings and still
+  proceed with the rest of the tool.
+
+driver: shell_script

testsuite/tests/test/208-stub_extension/failing.gpr

@@ -0,0 +1,2 @@
+project Failing extends "libext/libext.gpr" is
+end Failing;

testsuite/tests/test/208-stub_extension/libext/d.ads

@@ -0,0 +1,5 @@
+with E;
+
+package D is
+   function Lighted return Integer is (0);
+end D;

testsuite/tests/test/208-stub_extension/libext/libext.gpr

@@ -0,0 +1,4 @@
+with "libinc/libinc.gpr";
+
+project LibExt is
+end LibExt;

testsuite/tests/test/208-stub_extension/libext/libinc/e.adb

@@ -0,0 +1,2 @@
+package body E is
+end E;

testsuite/tests/test/208-stub_extension/libext/libinc/e.ads

@@ -0,0 +1,3 @@
+package E is
+   pragma Elaborate_Body;
+end E;

testsuite/tests/test/208-stub_extension/libext/libinc/libinc.gpr

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

testsuite/tests/test/208-stub_extension/test.sh

@@ -0,0 +1,4 @@
+#! /bin/sh
+
+gnattest -q -P failing.gpr --stub
+gprbuild -q -P gnattest_stub/harness/test_drivers.gpr

testsuite/tests/test/208-stub_extension/test.yaml

@@ -0,0 +1,6 @@
+description:
+  Test that gnattest does no crash when generating a harness with stubbing
+  for a project tree in which an extending project is present. This used to
+  crash due to a mis-management of the project table.
+
+driver: shell_script