Bug 997598 - Don't strip leading white space from mochitest output lines when stack fixer is in use. r=wlach
authorCameron McCormack <cam@mcc.id.au>
Fri, 18 Apr 2014 11:34:47 +1000
changeset 191252 280c066afbf185fccd74029d177c9824f4e6e381
parent 191251 f2bd6f0ab7619add682680e9ad1c5e2df7897ded
child 191253 c2094871202f0c9300195e17aafff2c9d2e28c9c
push idunknown
push userunknown
push dateunknown
reviewerswlach
bugs997598
milestone31.0a1
Bug 997598 - Don't strip leading white space from mochitest output lines when stack fixer is in use. r=wlach
testing/mochitest/runtests.py
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1290,17 +1290,17 @@ class Mochitest(MochitestUtilsMixin):
       elif mozinfo.isLinux and self.perl:
         # Run logsource through fix-linux-stack.pl (uses addr2line)
         # This method is preferred for developer machines, so we don't have to run "make buildsymbols".
         stackFixerCommand = [self.perl, os.path.join(self.utilityPath, "fix-linux-stack.pl")]
         stackFixerProcess = subprocess.Popen(stackFixerCommand, stdin=subprocess.PIPE,
                                              stdout=subprocess.PIPE)
         def fixFunc(line):
           stackFixerProcess.stdin.write(line + '\n')
-          return stackFixerProcess.stdout.readline().strip()
+          return stackFixerProcess.stdout.readline().rstrip()
 
         stackFixerFunction = fixFunc
 
       return (stackFixerFunction, stackFixerProcess)
 
     def finish(self, didTimeout):
       if self.stackFixerProcess:
         self.stackFixerProcess.communicate()