Merge branch 'O212-062-fix-regressions' into 'master'

Fix regressions following assertion coverage merge

See merge request eng/cov/gnatcoverage!265

See issue #7

Author: Viviane Garese

testsuite/tests/O212-062-assertions/src/assertions_2.adb

@@ -1,16 +1,12 @@
-with Ada.Assertions;
 with Assertions; use Assertions;
+with Silent_Last_Chance;
 
 procedure Assertions_2
 is
    Y : Integer := 2;
 begin
-   begin
-      --  Call to Foo with a parameter that does not satisfy the
-      --  precondition.
+   --  Call to Foo with a parameter that does not satisfy the
+   --  precondition.
 
-      Y := Foo (-2);                                        -- # foo_2
-   exception
-      when Ada.Assertions.Assertion_Error => null;          -- # catch_2
-   end;
+   Y := Foo (-2);  -- # foo_2
 end Assertions_2;

testsuite/tests/O212-062-assertions/src/catch_assertions_2.adb

@@ -0,0 +1,11 @@
+with Ada.Assertions;
+with Assertions_2;
+
+procedure Catch_Assertions_2 is
+begin
+   begin
+      Assertions_2;
+   exception
+      when Ada.Assertions.Assertion_Error => null;
+   end;
+end Catch_Assertions_2;

testsuite/tests/O212-062-assertions/src/catch_expr_func.adb

@@ -0,0 +1,11 @@
+with Ada.Assertions;
+with Expr_Func;
+
+procedure Catch_Expr_Func is
+begin
+   begin
+      Expr_Func;
+   exception
+      when Ada.Assertions.Assertion_Error => null;
+   end;
+end Catch_Expr_Func;

testsuite/tests/O212-062-assertions/src/expr_func.adb

@@ -1,7 +1,7 @@
 pragma Assertion_Policy (Check);
 pragma Ada_2012;
 
-with Ada.Assertions;
+with Silent_Last_Chance;
 
 procedure Expr_Func
 is
@@ -21,9 +21,5 @@ is
 begin
     Dummy := Foo (0);                                  -- # foo_call
 
-    begin
-        Dummy := Bar (42);                             -- # bar_call
-    exception
-        when Ada.Assertions.Assertion_Error => null;   -- # catch
-    end;
+    Dummy := Bar (42);                                 -- # bar_call
 end Expr_Func;

testsuite/tests/O212-062-assertions/src/test_assertions_2.adb

@@ -1,8 +1,8 @@
-with Assertions_2;
+with Catch_Assertions_2;
 
 procedure Test_Assertions_2 is
 begin
-   Assertions_2;
+   Catch_Assertions_2;
 end Test_Assertions_2;
 
 --# assertions.ads
@@ -27,4 +27,3 @@ end Test_Assertions_2;
 -- /same_ret/        l- ## s-
 --# assertions_2.adb
 -- /foo_2/           l+ ## c!
--- /catch_2/         l+ ## 0

testsuite/tests/O212-062-assertions/src/test_expr_func.adb

@@ -1,8 +1,8 @@
-with Expr_Func;
+with Catch_Expr_Func;
 
 procedure Test_Expr_Func is
 begin
-    Expr_Func;
+    Catch_Expr_Func;
 end Test_Expr_Func;
 
 --# expr_func.adb
@@ -15,4 +15,3 @@ end Test_Expr_Func;
 -- /dummy_decl/ l+ ## 0
 -- /foo_call/   l+ ## 0
 -- /bar_call/   l+ ## 0
--- /catch/      l+ ## 0

testsuite/tests/O212-062-assertions/src/test_type_inv_false.adb

@@ -1,3 +1,4 @@
+with Silent_Last_Chance;
 with Pack_Type_Invariant;
 
 with Ada.Assertions;

testsuite/tests/O212-062-assertions/test.opt

@@ -1 +1,2 @@
 bin-traces XFAIL Assertion coverage not yet supported for binary traces
+5.04a1|7.1.2 DEAD Test contains expression functions and Ada_2012 features

testsuite/tests/instr-cov/O212-062-unsupported-pragmas/test.opt

@@ -1 +1,2 @@
 bin-traces XFAIL Assertion coverage not yet supported for binary traces
+5.04a1|7.1.2 DEAD Test contains expression function and Ada_2012 features