updates for lcov

Author: TimSVector

src/main/resources/scripts/generate_lcov.py

@@ -107,7 +107,27 @@ def has_branches_covered(line):
             line.metrics.max_covered_mcdc_pairs)
 
     return count
-        
+       
+def get_function_name_line_number(file_path, function, initial_guess):
+
+    with open(file_path,"r") as fd:
+        lines = fd.readlines()
+
+    line_number_closest_so_far = initial_guess;
+    delta = 9999999999;
+
+    # print(function, line_number_closest_so_far, delta, initial_guess)
+    for count, line in enumerate(reversed(lines[:initial_guess+1])):
+        if function in line.replace(" ",""):
+            line_num = initial_guess - count
+            if abs(line_num - initial_guess) < delta:
+                line_number_closest_so_far = line_num
+                delta = abs(line_num - initial_guess)
+                # print(function, line_number_closest_so_far, delta, initial_guess)
+    
+    # print(line_number_closest_so_far + 1,function)
+    return line_number_closest_so_far + 1 ## add one since python starts from 0
+
 def runCoverageResultsMP(mpFile, verbose = False, testName = "", source_root = ""):
 
     vcproj = VCProjectApi(mpFile)
@@ -136,9 +156,9 @@ def runGcovResults(api, verbose = False, testName = "", source_root = "") :
         fname = file.display_name
         fpath = file.display_path.rsplit('.',1)[0]
         fpath = os.path.relpath(fpath,prj_dir).replace("\\","/")
-        
+
         fileDict[fpath] = file
-    
+
     output = ""
 
     for path in sorted(fileDict.keys()):
@@ -160,10 +180,11 @@ def runGcovResults(api, verbose = False, testName = "", source_root = "") :
         output += "TN:" + testName + "\n"
         new_path = new_path.replace("\\","/")
         output += "SF:" + new_path + "/" + file.name + "\n"
-        
+
         for func in file.functions:
+            func_name_line_number = get_function_name_line_number(file.display_path, func.name, func.start_line)
             fName = func.name + func.instrumented_functions[0].parameterized_name.replace(func.name,"",1)
-            FN.append("FN:" + str(func.start_line) + "," + fName)
+            FN.append("FN:" + str(func_name_line_number) + "," + fName)
             if has_anything_covered(func) > 0:
                 FNDA.append("FNDA:1" + "," + fName)
             else:
@@ -174,16 +195,27 @@ def runGcovResults(api, verbose = False, testName = "", source_root = "") :
             line_branch = []
 
             last_line = ""
+            any_line_covered = 0
+            any_return_found = False
+            found_func_start = False
 
             for line in func.iterate_coverage():
                 if has_any_coverage(line):
                     LF += 1
                     if has_anything_covered(line): 
                         lineCovered = "1"
                         LH += 1
+                        any_line_covered += 1
                     else:
                         lineCovered = "0"
-                    DA.append("DA:" + str(line.line_number) + "," + lineCovered)
+
+                    if " return" in line.text:
+                       any_return_found = True
+                    if not found_func_start:
+                        DA.append("DA:" + str(func_name_line_number) + "," + lineCovered)
+                        found_func_start = True
+                    else:
+                        DA.append("DA:" + str(line.line_number) + "," + lineCovered)
 
                     last_line = line.text
 
@@ -207,9 +239,12 @@ def runGcovResults(api, verbose = False, testName = "", source_root = "") :
                             branch_number += 1
 
 
-            if "return" not in last_line:
+            if True: #not any_return_found:
                 if verbose: print("counting last line: ", func.name, line.line_number,last_line)
-                DA.append("DA:" + str(line.line_number) + ",1")
+                if any_line_covered > 0:
+                    DA.append("DA:" + str(line.line_number) + ",1")
+                else:
+                    DA.append("DA:" + str(line.line_number) + ",0")
             else:
                 if verbose: print("not counting last line: ", func.name, line.line_number,last_line)
 

src/main/resources/scripts/generate_xml.py

@@ -99,7 +99,6 @@ def __init__(self, FullManageProjectName, verbose, teePrint, use_cte):
 
         if self.teePrint is None:
             self.teePrint = tee_print.TeePrint()
-            self.teePrint.teePrint("BaseGenerateXml called incorrectly, no teePrint")
 #
 # BaseGenerateXml - calculate coverage value
 #
@@ -802,7 +801,8 @@ def generate_local_results(self, results, key):
                                self.report_failed_only,
                                self.print_exc,
                                self.useStartLine,
-                               self.teePrint)
+                               self.teePrint,
+                               self.use_cte)
 
         localXML.topLevelAPI = self.api
         localXML.noResults = self.noResults

src/main/resources/scripts/vcast_exec.py

@@ -70,6 +70,7 @@ def __init__(self, args):
         self.pclp_input = args.pclp_input
 
         self.html_base_dir = args.html_base_dir
+        self.use_cte = args.use_cte
 
         if args.exit_with_failed_count == 'not present':
             self.useJunitFailCountPct = False
@@ -214,7 +215,7 @@ def runJunitMetrics(self):
             self.useStartLine = False
 
         self.failed_count, self.passed_count = generate_results.buildReports(self.FullMP,self.level,self.environment, 
-                True, self.timing, xml_data_dir = self.xml_data_dir, useStartLine=self.useStartLine)
+                True, self.timing, xml_data_dir = self.xml_data_dir, useStartLine=self.useStartLine, teePrint = None, use_cte = self.use_cte)
 
         # calculate the failed percentage
         if (self.failed_count + self.passed_count > 0):
@@ -340,6 +341,7 @@ def runExec(self):
     metricsGroup.add_argument('--cobertura_extended', help='Generate coverage results in extended Cobertura xml format', action="store_true", default = False)
     metricsGroup.add_argument('--lcov', help='Generate coverage results in an LCOV format', action="store_true", default = False)
     metricsGroup.add_argument('--junit', help='Generate test results in Junit xml format', action="store_true", default = False)
+    metricsGroup.add_argument('--junit_use_cte_for_classname', help=argparse.SUPPRESS, action="store_true", dest="use_cte")
     metricsGroup.add_argument('--sonarqube', help='Generate test results in SonarQube Generic test execution report format (CppUnit)', action="store_true", default = False)
     metricsGroup.add_argument('--pclp_input', help='Generate static analysis results from PC-lint Plus XML file to generic static analysis format (codequality)', action="store", default = None)
     metricsGroup.add_argument('--pclp_output_html', help='Generate static analysis results from PC-lint Plus XML file to an HTML output', action="store", default = "pclp_findings.html")