Fix expr_func/prim test

Update the coverage expectations.

Also adapt the test case as gnatcov no longer instrument primitives of a
tagged type T when the return type is T.

Author: Jugst3r

testsuite/tests/instr-cov/expr_func/prim/p.gpr

@@ -1,37 +1,39 @@
 """
-Check that we properly instrument expression functions that are primitives
-of tagged types for MC/DC.
+Check that gnatcov correctly processes expression functions that are primitives
+of tagged types for MC/DC, e.g. it warns about them, and they are reported as
+uninstrumented in the coverage report.
 """
 
-import os
-import os.path
-
 from SCOV.minicheck import build_run_and_coverage, check_xcov_reports
 from SUITE.context import thistest
 from SUITE.cutils import Wdir
 from SUITE.gprutils import GPRswitches
+from SUITE.tutils import gprfor
 
 
-p_gpr = os.path.abspath("p.gpr")
-obj_dir = os.path.abspath("obj")
-
 tmp = Wdir("tmp_")
 
 build_run_and_coverage(
-    gprsw=GPRswitches(root_project=p_gpr),
+    gprsw=GPRswitches(root_project=gprfor(srcdirs=[".."], mains=["main.adb"])),
     covlevel="stmt+uc_mcdc",
     mains=["main"],
     extra_coverage_args=["-axcov", "--output-dir=xcov"],
-    gpr_obj_dir=obj_dir,
-    gpr_exe_dir=obj_dir,
     trace_mode="src",
+    tolerate_instrument_messages=(
+        "cannot instrument an expression function which"
+    ),
 )
 
-# TODO: update coverage expectations once compiler bug
-# has been fixed and XFAIL is removed.
-
 check_xcov_reports(
-    "xcov", {"main.adb.xcov": {"+": {4, 5, 7, 12, 14, 17, 19, 21, 22, 23, 24}}}
+    "xcov",
+    {
+        "main.adb.xcov": {"+": {6}},
+        "pak.ads.xcov": {
+            "+": {4, 5, 6, 13, 14, 15},
+            "-": {8, 10},
+            "?": {11, 16},
+        },
+    },
 )
 
 thistest.result()