Merge branch 'eyraud/gnaamp' into 'master'

AAMP: copy the runtime to the test directory

See merge request eng/das/cov/gnatcoverage!844

As AAMP does not support library project, always copy the instrumentation
runtime to the test directory as building an instrumented program builds
it.

For eng/das/cov/gnatcoverage#256

Author: Jugst3r

testsuite/SCOV/instr.py

@@ -2,8 +2,9 @@
 
 import os.path
 import re
+import shutil
 
-from e3.fs import mkdir
+from e3.fs import mkdir, sync_tree
 
 from SUITE.context import thistest
 from SUITE.control import env
@@ -344,3 +345,21 @@ def maybe_relocate_binaries(object_dir, exe_dir, mains):
     if "aamp" in env.target.platform:
         for main in mains:
             copy_to_dir(object_dir, exe_dir, main)
+
+
+def maybe_copy_runtime(test_dir):
+    """
+    Copy the Ada instrumentation runtime in test_dir for the AAMP target.
+    """
+    if "aamp" in env.target.platform:
+        rts_path = os.path.join(
+            os.path.dirname(shutil.which("gnatcov")),
+            "..",
+            "share",
+            "gnatcoverage",
+            "gnatcov_ada_rts",
+        )
+        rts_dest_path = os.path.join(test_dir, "rts")
+        mkdir(rts_dest_path)
+        sync_tree(rts_path, rts_dest_path)
+        env.add_search_path(env_var="GPR_PROJECT_PATH", path=rts_dest_path)

testsuite/SCOV/internals/driver.py

@@ -32,6 +32,7 @@
     add_dumper_lch_hook,
     default_dump_channel,
     default_dump_trigger,
+    maybe_copy_runtime,
     maybe_relocate_binaries,
     xcov_convert_base64,
     xcov_instrument,
@@ -1484,6 +1485,11 @@ def mode_build(self):
             subdirs = None
             instrument_gprsw = GPRswitches(root_project=self.gpr)
 
+        # The AAMP target does not support library project and requires
+        # rebuilding the instrumentation runtime: copy it in the test
+        # directory.
+        maybe_copy_runtime(os.getcwd())
+
         # Instrument now, requesting the propagation of instrumentation
         # issues on the test status. Note that we expect this to include
         # a check on instrumentation warnings.

testsuite/SCOV/minicheck.py

@@ -17,6 +17,7 @@
 
 from SCOV.instr import (
     default_dump_channel,
+    maybe_copy_runtime,
     maybe_relocate_binaries,
     xcov_convert_base64,
     xcov_instrument,
@@ -267,6 +268,11 @@ def gprbuild_wrapper(root_project):
         if dump_channel == "auto":
             dump_channel = default_dump_channel()
 
+        # The AAMP target does not support library project and requires
+        # rebuilding the instrumentation runtime: copy it in the test
+        # directory.
+        maybe_copy_runtime(os.getcwd())
+
         # Instrument the project and build the result
         extra_instr_args = cov_or_instr_args + list(extra_instr_args or [])
         xcov_instrument(

tools/gnatcov/ada-rts/gnatcov_rts-traces-output.adb

@@ -310,13 +310,16 @@ package body GNATcov_RTS.Traces.Output is
 
       declare
          Timestamp : Interfaces.Unsigned_64 := Exec_Date;
-         Bytes     : Uint8_Array := (1 => 0);
+         Bytes     : Uint8_Array (1 .. 8);
+         Bytes_Str : String (1 .. 8);
+         for Bytes_Str'Address use Bytes'Address;
+         pragma Import (Ada, Bytes_Str);
       begin
          for I in 1 .. 8 loop
-            Bytes (1) := Interfaces.Unsigned_8 (Timestamp mod 8);
+            Bytes (I) := Interfaces.Unsigned_8 (Timestamp mod 8);
             Timestamp := Shift_Right (Timestamp, 8);
-            Write_Bytes (Output, Bytes);
          end loop;
+         Write_Info (Output, Info_Exec_Date, Bytes_Str);
       end;
 
       Write_Info (Output, Info_User_Data, User_Data);