Merge branch 'topic/append_env' into 'master'

Add `append_path` command to `tester-run`

See merge request eng/ide/ada_language_server!1134

Author: reznikmm

source/tester/tester-macros.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2018-2019, AdaCore                     --
+--                     Copyright (C) 2018-2023, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -22,6 +22,9 @@ with Ada.Strings.Maps;
 
 with GNAT.Regpat;
 with GNAT.OS_Lib;
+
+with VSS.Strings.Conversions;
+
 with URIs;
 
 package body Tester.Macros is
@@ -171,11 +174,16 @@ package body Tester.Macros is
    procedure Expand
      (Test : in out GNATCOLL.JSON.JSON_Value;
       Env  : Spawn.Environments.Process_Environment;
-      Path : String)
+      Path : VSS.Strings.Virtual_String)
    is
-      Full_Name : constant String := Ada.Directories.Full_Name (Path);
+      File      : constant String :=
+        VSS.Strings.Conversions.To_UTF_8_String (Path);
+
+      Full_Name : constant String := Ada.Directories.Full_Name (File);
+
       Directory : constant String :=
         Ada.Directories.Containing_Directory (Full_Name);
+
       Env_With_Dir : Spawn.Environments.Process_Environment := Env;
    begin
       Env_With_Dir.Insert ("DIR", Directory);

source/tester/tester-macros.ads

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2018-2019, AdaCore                     --
+--                     Copyright (C) 2018-2023, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -19,15 +19,17 @@ with GNATCOLL.JSON;
 
 with Spawn.Environments;
 
+with VSS.Strings;
+
 package Tester.Macros is
 
    procedure Expand
      (Test : in out GNATCOLL.JSON.JSON_Value;
       Env  : Spawn.Environments.Process_Environment;
-      Path : String);
+      Path : VSS.Strings.Virtual_String);
    --  Expand macros in given JSON test. The Path is test's path.
    --
-   --  Currently only one macro is supported:
+   --  Currently next macros are supported:
    --  * ${NAME} - expands with environment variable NAME from Env
    --
    --  * $URI{x} - rewrite as "file:///path", treat x as relative to test

source/tester/tester-run.adb

@@ -26,9 +26,6 @@ with VSS.Strings;
 with VSS.Strings.Conversions;
 with VSS.String_Vectors;
 
-with Spawn.Environments;
-
-with Tester.Macros;
 with Tester.Tests;
 
 procedure Tester.Run is
@@ -52,9 +49,6 @@ procedure Tester.Run is
          Description => "JSON test script");
    end Options;
 
-   Env  : constant Spawn.Environments.Process_Environment :=
-     Spawn.Environments.System_Environment;
-
    JSON : GNATCOLL.JSON.JSON_Value;
 begin
    VSS.Command_Line.Add_Option (Options.Debug);
@@ -105,15 +99,15 @@ begin
 
       Ada.Text_IO.Close (Input);
       JSON := GNATCOLL.JSON.Read (Text, File);
-      Tester.Macros.Expand (JSON, Env, File);
 
       declare
          Test : Tester.Tests.Test;
       begin
          Test.Run
-           (JSON.Get,
-            On_Hang => Options.On_Hang.Value,
-            Debug   => Options.Debug.Is_Specified);
+           (Commands => JSON.Get,
+            File     => Options.File.Value,
+            On_Hang  => Options.On_Hang.Value,
+            Debug    => Options.Debug.Is_Specified);
       end;
    end;
 end Tester.Run;