Merge branch '254-regeneration' into 'master'

Forbid use of Subdirs and source dir path with **

Closes #254

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

Author: Viviane Garese

src/test-actions.adb

@@ -514,6 +514,31 @@ package body Test.Actions is
 
       end if;
 
+      --  Forbid specifying a test subdir along with a source directoy path
+      --  ending with "**".
+      --  Upon running gnattest twice in a row, the subdirs created during the
+      --  first run will be taken as source directories during the second,
+      --  leading to an error.
+
+      if (Root_Prj.Has_Attribute (Subdir_Mode_Att)
+          or else Arg (Cmd, Subdirs) /= null)
+        and then Root_Prj.Has_Attribute (Source_Dirs_Attribute)
+      then
+         for Src_Dir_Path
+           of Root_Prj.Attribute_Value (Source_Dirs_Attribute).all
+         loop
+            if Src_Dir_Path'Length >= 2
+              and then Src_Dir_Path
+                         (Src_Dir_Path'Last - 1 .. Src_Dir_Path'Last)
+                       = "**"
+            then
+               Cmd_Error_No_Help
+                 ("cannot specify test subdir along with a source directory"
+                  & " path ending with ""**""");
+            end if;
+         end loop;
+      end if;
+
       if Arg (Cmd, Stubs_Dir) /= null then
 
          Free (Test.Common.Stub_Dir_Name);

testsuite/tests/test/254-subdir-regeneration/src/main.adb

@@ -0,0 +1,8 @@
+with Ada.Text_IO; use Ada.Text_IO;
+
+with Pkg;
+
+procedure Main is
+begin
+   Put_Line (Pkg.Foo);
+end Main;

testsuite/tests/test/254-subdir-regeneration/src/pkg.adb

@@ -0,0 +1,6 @@
+package body Pkg is
+   function Foo return String is
+   begin
+      return "Foo";
+   end Foo;
+end Pkg;

testsuite/tests/test/254-subdir-regeneration/src/pkg.ads

@@ -0,0 +1,3 @@
+package Pkg is
+   function Foo return String;
+end Pkg;

testsuite/tests/test/254-subdir-regeneration/test.out

@@ -0,0 +1,3 @@
+gnattest: cannot specify test subdir along with a source directory path ending with "**"
+gnattest: cannot specify test subdir along with a source directory path ending with "**"
+>>>program returned status code 1

testsuite/tests/test/254-subdir-regeneration/test.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+gnattest -q -P test1.gpr
+gnattest -q -P test2.gpr --subdirs="my_tests"

testsuite/tests/test/254-subdir-regeneration/test.yaml

@@ -0,0 +1,9 @@
+description:
+  An error message should be emitted when a test subdir name is specified
+  (either throught --subdir or the Subdir gnattest project attribute) along
+  with a source directory path ending in "**" in the project file.
+  This is to avoid gnattest seeing a previouly generated test subdirectory
+  as a source directory when ran twice in row.
+
+driver: shell_script
+

testsuite/tests/test/254-subdir-regeneration/test1.gpr

@@ -0,0 +1,11 @@
+project Test1 is
+
+   for Languages use ("Ada");
+   for Source_Dirs use ("src" & "/**");
+   for Object_Dir use "obj";
+
+   package GNATtest is
+      for Subdir use "my_tests";
+   end GNATtest;
+
+end Test1;

testsuite/tests/test/254-subdir-regeneration/test2.gpr

@@ -0,0 +1,7 @@
+project Test2 is
+
+   for Languages use ("Ada");
+   for Source_Dirs use ("src" & "/**");
+   for Object_Dir use "obj";
+
+end Test2;