Updates

Author: TimSVector

generate_xml.py

@@ -500,6 +500,8 @@ def __init__(self, FullManageProjectName, build_dir, env, compiler, testsuite, c
         unit_path = os.path.join(build_dir,env + '.vce')
         self.failed_count = 0
         self.passed_count = 0
+        self.useStartLine = False
+        self.noResults = False
 
         if os.path.exists(cov_path) and os.path.exists(cov_path[:-4]):
             self.using_cover = True
@@ -900,10 +902,10 @@ def write_testcase(self, tc, unit_name, func_name, st_is_monitored = False, unit
 
             testcaseString = testcaseStringExtraStatus
             data = testcaseString % (tc_name_full, unitName, deltaTimeStr, fpath, startLine, extraStatus, msg)
-            self.fh.write(data.encode(self.envFmt, "replace"))
+            self.fh.write(data.encode(self.encFmt, "replace"))
         else:
             data = testcaseString % (tc_name_full, classname, deltaTimeStr, extraStatus, msg) + "\n"     
-            self.fh.write(data.encode(self.envFmt, "replace"))   
+            self.fh.write(data.encode(self.encFmt, "replace"))   
 
 #
 # Internal - no support for skipped test cases yet
@@ -950,8 +952,8 @@ def was_test_case_skipped(self, tc, searchName, isSystemTest):
 # Internal - write the end of the jUnit XML file and close it
 #
     def end_test_results_file(self):
-        self.fh.write("   </testsuite>\n".encode(self.envFmt, "replace"))
-        self.fh.write("</testsuites>\n".encode(self.envFmt, "replace")) 
+        self.fh.write("   </testsuite>\n".encode(self.encFmt, "replace"))
+        self.fh.write("</testsuites>\n".encode(self.encFmt, "replace")) 
         self.fh.close()
 
 #