Merge branch 'garese/215-interfaces' into 'master'

Fix inclusion of tested unit to driver interface

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

Author: Viviane Garese

src/test-harness.adb

@@ -21,6 +21,7 @@
 -- <http://www.gnu.org/licenses/>.                                          --
 ------------------------------------------------------------------------------
 
+with Ada.Directories;
 with GNATCOLL.JSON;
 with GNATCOLL.VFS;        use GNATCOLL.VFS;
 with GNATCOLL.Traces;     use GNATCOLL.Traces;
@@ -3149,43 +3150,43 @@ package body Test.Harness is
                  GNATCOLL.Projects.Project_From_Name
                    (Source_Project_Tree, P.Name_Of_Extended.all);
 
+               Exposed_List : constant String_List :=
+                 Project.Attribute_Value (Interfaces_Attribute).all;
+
                Driver_Sources_Present : constant Boolean :=
-                 P.Sources_List.First = List_Of_Strings.No_Element;
+                 P.Sources_List.First /= List_Of_Strings.No_Element;
             begin
                S_Put (3, "for Interfaces use (");
 
                --  Go through all units exposed in the interface and add them
                --  to the driver's interface.
-               declare
-                  Exposed_List : constant String_List :=
-                    Project.Attribute_Value (Interfaces_Attribute).all;
-               begin
-                  for Source of Exposed_List loop
-                     S_Put (0, """" & Source.all & """,");
-                  end loop;
-               end;
+
+               for Source of Exposed_List loop
+                  S_Put (0, """" & Source.all & """,");
+               end loop;
 
                --  If there are source for this test driver, add all of them to
                --  the interface. If not, only add the relevant unit.
 
                if Driver_Sources_Present then
-                  S_Put (0, """" & Base_Name (P.UUT_File_Name.all) & """");
-               else
                   declare
                      Cur : String_Set.Cursor := Sources_Names.First;
                   begin
                      while Cur /= String_Set.No_Element loop
-                        S_Put (0, """" & String_Set.Element (Cur) & """");
-
+                        S_Put (0, """" & String_Set.Element (Cur) & """,");
                         Next (Cur);
-
-                        if Cur /= String_Set.No_Element then
-                           S_Put (0, ",");
-                        end if;
                      end loop;
                   end;
                end if;
 
+               --  Always add the unit under test to the interface
+
+               S_Put
+                 (0,
+                  """"
+                  & Ada.Directories.Simple_Name (P.UUT_File_Name.all)
+                  & """");
+
                S_Put (0, ");");
 
                --  Reset the sources list to be added to the interface

testsuite/tests/test/215-interface/lib4.gpr

@@ -0,0 +1,10 @@
+library project Lib4 is
+
+   for Library_Name use "lib4";
+   for Library_Kind use "static";
+   for Library_Dir use "lib4";
+   for Library_Interface use ("Pkg");
+   for Object_Dir use "obj-lib4";
+   for Source_Dirs use ("src-lib4");
+
+end Lib4;

testsuite/tests/test/215-interface/src-lib4/pkg.adb

@@ -0,0 +1,10 @@
+with Pkh;
+
+package body Pkg is
+
+   function Foo (X : Positive) return Positive is
+   begin
+      return Pkh.Bar (X);
+   end Foo;
+
+end PKg;

testsuite/tests/test/215-interface/src-lib4/pkg.ads

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

testsuite/tests/test/215-interface/src-lib4/pkh.adb

@@ -0,0 +1,8 @@
+package body Pkh is
+
+   function Bar (X : Positive) return Positive is
+   begin
+      return X;
+   end Bar;
+
+end Pkh;

testsuite/tests/test/215-interface/src-lib4/pkh.ads

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

testsuite/tests/test/215-interface/test.sh

@@ -2,3 +2,6 @@
 
 gnattest -q -dd -Plib1 --stub
 gprbuild -q -P obj/gnattest_stub/harness/test_drivers.gpr
+
+gnattest -q -dd -Plib4 --stub
+gprbuild -q -P obj-lib4/gnattest_stub/harness/test_drivers.gpr