Reverting calls to not use imported results on lcov and cobertuyra

Author: TimSVector

src/main/resources/scripts/cobertura.py

@@ -44,7 +44,7 @@
 
 fileList = []
 
-from vcast_utils import dump, checkVectorCASTVersion, getVectorCASTEncoding, checkProjectResults
+from vcast_utils import dump, checkVectorCASTVersion, getVectorCASTEncoding
 
 encFmt = getVectorCASTEncoding()
 
@@ -347,13 +347,11 @@ def procesCoverage(coverXML, coverApi, extended = False, source_root = ""):
 
     if extended:
         for func in coverApi.functions:
-    
-            if isinstance(func.instrumented_functions[0].parameterized_name, bool):
-                continue
-                
+                      
             method = etree.SubElement(methods, "method")
+            
             method.attrib['name'] = func.name
-            method.attrib['signature'] = func.instrumented_functions[0].parameterized_name.replace(func.name,"",1)    
+            method.attrib['signature'] = func.instrumented_functions[0].parameterized_name.replace(func.name,"",1)
             method.attrib['line-rate'] = str(func.metrics.max_covered_statements_pct/100.0)
 
             statementPercentStr = "{:.2f}".format(func.metrics.max_covered_statements_pct) + "% (" + str(func.metrics.max_covered_statements) + "/" + str(func.metrics.statements) + ")"             
@@ -389,23 +387,9 @@ def procesCoverage(coverXML, coverApi, extended = False, source_root = ""):
     return processStatementBranchMCDC(coverApi, lines, extended)
 
 def runCoverageResultsMP(packages, mpFile, verbose = False, extended=False, source_root = ""):
-    
-    with VCProjectApi(mpFile) as vcproj:
-
-        anyLocalResults, anyImportedResults = checkProjectResults(vcproj)
-
-        if anyImportedResults:
-            importedResultsError = "  ** Cobertura results does not processing imported results at this time\n\n"
-            print(importedResultsError)
-            return [-1] * 19
-            
-        if not anyLocalResults:
-            localResultsError = "  ** No local results in project to process\n\n"
-            print(localResultsError)
-            return [-1] * 19
 
+    with VCProjectApi(mpFile) as vcproj:
         api = vcproj.project.cover_api
-        
         results = runCoberturaResults(packages, api, verbose = False, extended = extended, source_root = source_root)
 
     return results
@@ -466,7 +450,8 @@ def runCoberturaResults(packages, api, verbose = False, extended = False, source
         except:
             prj_dir = os.getcwd().replace("\\","/") + "/"    
 
-    # get a sorted listed of all the files with the proj directory stripped off     
+    # get a sorted listed of all the files with the proj directory stripped off
+     
     for file in api.SourceFile.all():  
         if file.display_name == "":
             continue
@@ -768,7 +753,7 @@ def generateCoverageResults(inFile, azure = False, xml_data_dir = "xml_data", ve
     if MCDC_rate   != -1.0: print ("mcdc pairs: {:.2f}% ({:d} out of {:d})".format(MCDC_rate*100.0, cov_mcdc, total_mcdc))
 
     if statement_rate   != -1.0: print ("coverage: {:.2f}% of statements".format(statement_rate*100.0))
-    if complexity       != -1.0: print ("complexity: {:d}".format(complexity))
+    print ("complexity: {:d}".format(complexity))
     source = etree.SubElement(sources, "source")
     source.text = "./"
 

src/main/resources/scripts/generate_lcov.py

@@ -40,17 +40,12 @@
 import subprocess
 import argparse
 
-from vcast_utils import dump, checkVectorCASTVersion, getVectorCASTEncoding, checkProjectResults
+from vcast_utils import dump, checkVectorCASTVersion, getVectorCASTEncoding
 try:
     from safe_open import open
 except:
     pass
 
-try:
-    import math
-    INF = math.inf
-except Exception:
-    INF = float("inf")  # Py2-compatible
 encFmt = getVectorCASTEncoding()
 
 fileList = []
@@ -121,43 +116,28 @@ def has_branches_covered(line):
 
 def get_function_name_line_number(file_path, function, initial_guess):
 
-    with open(file_path, "rb") as fd:
+    with open(file_path,"rb") as fd:
         lines = [line.decode(encFmt, "replace") for line in fd.readlines()]
+        
+    line_number_closest_so_far = initial_guess;
+    delta = 9999999999;
 
-    if initial_guess is None or initial_guess >= len(lines):
-        initial_guess = len(lines) - 1
-
-    line_number_closest_so_far = initial_guess
-    delta = INF
-
-    for count, line in enumerate(reversed(lines[:initial_guess + 1])):
-        if function in line.replace(" ", ""):
+    # 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)
-
-    return line_number_closest_so_far + 1  # convert 0-based to 1-based
-
+                # 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 = ""):
 
     with VCProjectApi(mpFile) as vcproj:
-    
-        anyLocalResults, anyImportedResults = checkProjectResults(vcproj)
-
-        if anyImportedResults:
-            importedResultsError = "  ** LCOV results does not processing imported results at this time\n\n"
-            print(importedResultsError)
-            return importedResultsError
-            
-        if not anyLocalResults:
-            localResultsError = "  ** No local results in project to process\n\n"
-            print(localResultsError)
-            return localResultsError
-
         api = vcproj.project.cover_api
-        
         results = runGcovResults(api, verbose = verbose, testName = vcproj.project.name, source_root=source_root)
 
     return results
@@ -173,7 +153,7 @@ def runGcovResults(api, verbose = False, testName = "", source_root = "") :
         except:
             prj_dir = os.getcwd().replace("\\","/") + "/"    
 
-    # get a sorted listed of all the files with the proj directory stripped off    
+    # get a sorted listed of all the files with the proj directory stripped off
     for file in api.SourceFile.all():  
         if file.display_name == "":
             continue