Merge branch 'pmderodat/error' into 'master'

Display which SID/checkpoint is being loaded in case of internal error

Closes #110

See merge request eng/cov/gnatcoverage!241

Closes eng/cov/gnatcoverage#110

Author: pmderodat

testsuite/tests/TC11-052-internal-error/test.py

@@ -5,8 +5,10 @@
 import re
 import os
 
+from SCOV.minicheck import build_and_run
 from SUITE.context import thistest
 from SUITE.cutils import Wdir, contents_of
+from SUITE.gprutils import GPRswitches
 from SUITE.tutils import gprfor, xcov
 
 
@@ -81,4 +83,19 @@ def check(args, trigger, info):
       trigger="ada-instrument-insert-stmt-witness",
       info=r"Instrumenting ConcreteTypeDecl at [^\n]*main\.adb:6:4-6:26")
 
+# Instrument the example project, run its main to produce a source trace and
+# then trigger an internal error while loading the SID file.
+xcov_args = build_and_run(
+    gprsw=GPRswitches(root_project=prj),
+    covlevel="stmt",
+    mains=["main"],
+    extra_coverage_args=[],
+    trace_mode="src",
+)
+check(
+    args=xcov_args,
+    trigger="load-checkpoint",
+    info="Loading [^\n]*main\.sid",
+)
+
 thistest.result()

tools/gnatcov/checkpoints.adb

@@ -548,12 +548,19 @@ package body Checkpoints is
       Purpose              : Checkpoint_Purpose;
       Ignored_Source_Files : access GNAT.Regexp.Regexp)
    is
+      Dummy     : constant Context_Handle :=
+        Create_Context ("Loading " & Filename);
       SF        : Ada.Streams.Stream_IO.File_Type;
       CP_Header : Checkpoint_Header;
       Levels    : Levels_Type;
    begin
       Open (SF, In_File, Filename);
 
+      --  If requested, create an artificial internal error when loading
+      --  checkpoints.
+
+      Raise_Stub_Internal_Error_For (Load_Checkpoint);
+
       declare
          CLS : aliased Checkpoint_Load_State :=
            (Root_Stream_Type with

tools/gnatcov/outputs.ads

@@ -101,6 +101,9 @@ package Outputs is
       Arguments_Loading,
       --  Raise an error after Argparse's work and before loading arguments
 
+      Load_Checkpoint,
+      --  Raise an error when loading a checkpoint
+
       Ada_Instrument_Start_File,
       --  Raise an error when starting the instrumentation of a source file