Merge branch 'eyraud/126-main-in-dep' into 'master'

instrumentation: do not instrument main from project dependencies

Closes #126

See merge request eng/cov/gnatcoverage!273

This is consistent with gprbuild behavior.

Closes eng/cov/gnatcoverage#126

Author: Jugst3r

testsuite/tests/PC09-022-auto-exename/src-sub/sub_main.adb

@@ -136,26 +136,6 @@ def run(self):
             mains=('main_proc.adb', ),
             build=False,
             should_succeed=False),
-
-    # Check success when there is one single main in the whole project closure:
-    # once when the main is in the root project...
-    Project(project_files, 'sub', 'src-sub',
-            mains=('sub_main.adb', ),
-            deps=('nomain', ),
-            should_succeed=True),
-
-    # ... and once when it is in a dep project
-    Project(project_files, 'sub_main_in_dep', 'src-sub',
-            mains=(),
-            deps=('single', ),
-            should_succeed=True),
-
-    # Check that we have an error when there is at most one main per project
-    # and multiple projects with a main.
-    Project(project_files, 'sub_double', 'src-sub',
-            mains=('sub_main.adb', ),
-            deps=('single', ),
-            should_succeed=False),
 ):
     assert p.name not in project_files
     project_files[p.name] = p

testsuite/tests/PC09-022-auto-exename/test.py

@@ -0,0 +1,4 @@
+procedure Main is
+begin
+   null;
+end Main;

testsuite/tests/instr-cov/126-main-in-dependency/src-main-dep/main.adb

@@ -0,0 +1,6 @@
+with Main;
+
+procedure Main_Root is
+begin
+   Main;
+end Main_Root;

testsuite/tests/instr-cov/126-main-in-dependency/src/main_root.adb

@@ -0,0 +1,30 @@
+"""
+Regression testcase: checks that gnatcov correctly deals with mains in
+dependency projects. It used to crash when there was a main in one of the
+dependencies. The correct behavior should be not instrumenting them as a main.
+"""
+
+import os.path
+
+from SCOV.minicheck import build_run_and_coverage
+from SUITE.context import thistest
+from SUITE.cutils import Wdir
+from SUITE.gprutils import GPRswitches
+from SUITE.tutils import gprfor
+
+tmp = Wdir('tmp_')
+
+main_prj = gprfor(srcdirs=[os.path.join("..", "src-main-dep")],
+                  prjid="main_dep", mains=["main.adb"], objdir="obj-main")
+root_prj = gprfor(srcdirs=[os.path.join("..", "src")], deps=[main_prj],
+                  mains=["main_root.adb"], objdir="obj")
+
+# This also checks that we do not produce multiple traces
+build_run_and_coverage(
+    gprsw=GPRswitches(root_project=root_prj),
+    covlevel='stmt',
+    mains=["main_root"],
+    extra_coverage_args=["-axcov"],
+)
+
+thistest.result()

testsuite/tests/instr-cov/126-main-in-dependency/test.py

@@ -1431,7 +1431,8 @@ package body Project is
    --  Start of processing for Enumerate_Mains
 
    begin
-      Iterate_Projects (Root_Project, Enumerate_Mains'Access, True);
+      Iterate_Projects
+        (Root_Project, Enumerate_Mains'Access, Recursive => False);
       return Result : Main_Source_File_Array (Mains.First_Index
                                               .. Mains.Last_Index)
       do