Bug 1094526 - remove extra \n chars from xpcshell test output. r=chmanchester
authorMark Hammond <mhammond@skippinet.com.au>
Thu, 06 Nov 2014 14:56:32 +1100
changeset 238608 f79e13de65b0266774fc2a0266e7005b7bc0b4b1
parent 238607 844ad6f2b2ae35ec974cca0ea31396f124128fc5
child 238609 c6c9c652409f678273f05bd0de7eb418bc5ae0e3
child 238610 cc8520c640df03f245b577f005fd4dfd25e4f5eb
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1094526
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1094526 - remove extra \n chars from xpcshell test output. r=chmanchester
testing/xpcshell/runxpcshelltests.py
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -484,17 +484,17 @@ class XPCShellTestThread(Thread):
 
         if self.saw_proc_start and not self.saw_proc_end:
             self.has_failure_output = True
 
     def log_line(self, line):
         """Log a line of output (either a parser json object or text output from
         the test process"""
         if isinstance(line, basestring):
-            line = cleanup_encoding(line)
+            line = cleanup_encoding(line).rstrip("\r\n")
             self.log.process_output(self.proc_ident,
                                     line,
                                     command=self.complete_command)
         else:
             if 'message' in line:
                 line['message'] = cleanup_encoding(line['message'])
             if 'xpcshell_process' in line:
                 line['thread'] =  ' '.join([current_thread().name, line['xpcshell_process']])