Updates

Author: TimSVector

src/main/resources/scripts/generate_qa_results_xml.py

@@ -5,7 +5,9 @@
 except ImportError:
     # html not standard module in Python 2.
     from cgi import escape
-import sys, subprocess, os
+import sys, subprocess, os           
+from vcast_utils import dump, getVectorCASTEncoding
+
 global saved_compiler, saved_testsuite, saved_envname
 
 saved_compiler = ""
@@ -18,32 +20,30 @@ def get_timestamp():
     if hour > 12:
         hour -= 12
     return dt.strftime('%d %b %Y  @HR@:%M:%S %p').upper().replace('@HR@', str(hour))
-
+                                                
 def writeJunitHeader(currentEnv, junitfile, failed, total, unit_report_name, encoding = 'UTF-8'):
-    
-    junitfile.write("<?xml version=\"1.0\" encoding=\"" + encoding.upper() + "\"?>\n")
+                     
+    data = "<?xml version=\"1.0\" encoding=\"{}\"?>\n".format(encoding)
+    data += "<testsuites>\n  <!-- {} -->\n".format(unit_report_name)
+    data += "  <testsuite errors=\"{}\" tests=\"{}\" failures=\"{}\" name=\"{}\" id=\"1\">\n".format(0, total, failed, currentEnv)  
 
-    junitfile.write("<testsuites>\n  <!--" + unit_report_name + "-->\n")
-                    
-    junitfile.write("  <testsuite errors=\"%d\" tests=\"%d\" failures=\"%d\" name=\"%s\" id=\"1\">\n" % 
-        (0, total, failed, currentEnv))
+    junitfile.write(data.encode(encoding, "replace"))
 
-def writeJunitData(junitfile,all_tc_data):
-    junitfile.write(all_tc_data)
+def writeJunitData(junitfile,all_tc_data, encoding):
+    junitfile.write(all_tc_data.encode(encoding, "replace"))
 
-def writeJunitFooter(junitfile):
-    junitfile.write("  </testsuite>\n")
-    junitfile.write("</testsuites>\n")
+def writeJunitFooter(junitfile, encoding):
+    junitfile.write("  </testsuite>\n".encode(encoding, "replace"))
+    junitfile.write("</testsuites>\n".encode(encoding, "replace"))
 
 def write_tc_data(currentEnv, unit_report_name, jobNameDotted, passed, failed, error, testcase_data, encoding = 'utf-8', xml_data_dir = "xml_data"):
 
-    fh = open(os.path.join(xml_data_dir,unit_report_name), "w")
-
-    writeJunitHeader(currentEnv, fh, failed, failed+passed, unit_report_name, encoding)
-    writeJunitData(fh, testcase_data)
-    writeJunitFooter(fh)
-    fh.close()
-
+    with open(os.path.join(xml_data_dir,unit_report_name), "wb") as fh:
+        encoding = getVectorCASTEncoding()
+        writeJunitHeader(currentEnv, fh, failed, failed+passed, unit_report_name, encoding)
+        writeJunitData(fh, testcase_data, encoding)
+        writeJunitFooter(fh, encoding)         
+        
 def generateJunitTestCase(jobname, tc_name, passFail):
     testCasePassString ="    <testcase name=\"%s\" classname=\"%s\" time=\"0\"/>\n"
     testCaseFailString ="""    <testcase name="%s" classname="%s" time="0">

src/main/resources/scripts/generate_xml.py

@@ -479,12 +479,7 @@ def _generate_cover(self, cov_type):
             functions_added = False
             funcs_with_cover_data = []
             for func in srcFile.functions:
-                try:
-                    hasAnyCov = func.has_coverage_data
-                except:
-                    hasAnyCov =  func.instrumented_functions[0].has_coverage_data
-
-                if hasAnyCov:
+                if self.hasAnyCov(func):
                     functions_added = True
                     funcs_with_cover_data.append(func)
 
@@ -499,8 +494,6 @@ def _generate_cover(self, cov_type):
             sorted_funcs.sort(key=lambda x: (x.name))
 
             for func in sorted_funcs:
-
-
                 try:
                     cover_function = func.cover_data.metrics
                 except:
@@ -525,16 +518,12 @@ def _generate_cover(self, cov_type):
 
             self.grand_total_max_covered_branches += metrics.max_covered_branches + metrics.max_covered_mcdc_branches
             self.grand_total_branches += metrics.branches + metrics.mcdc_branches
-
             self.grand_total_max_covered_statements += metrics.max_covered_statements
             self.grand_total_statements += metrics.statements
-
             self.grand_total_max_mcdc_covered_branches += metrics.max_covered_mcdc_branches
             self.grand_total_mcdc_branches += metrics.mcdc_branches
-
             self.grand_total_max_covered_mcdc_pairs += metrics.max_covered_mcdc_pairs
             self.grand_total_mcdc_pairs += metrics.mcdc_pairs
-
             self.grand_total_max_covered_function_calls += metrics.max_covered_function_calls
             self.grand_total_function_calls += metrics.function_calls