Strip out \r characters from pexpect's log capture before adding the results.

build/android/pylib/gtest/test_package.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 import logging
 import os
 import re
 
 from pylib import constants
@@ skipping 138 matching lines @@
         full_test_name = None
         found = p.expect([re_run, re_passed, re_runner_fail],
                          timeout=self.timeout)
         if found == 1:  # re_passed
           break
         elif found == 2:  # re_runner_fail
           break
         else:  # re_run
           full_test_name = p.match.group(1).replace('\r', '')
           found = p.expect([re_ok, re_fail, re_crash], timeout=self.timeout)
+
+          log = p.before.replace('\r', '')

[frankf, 2013/06/18 00:04:59]

Move this to line 158

[scherkus (not reviewing), 2013/06/18 00:41:19]

Done.

           if found == 0:  # re_ok
             if full_test_name == p.match.group(1).replace('\r', ''):
               results.AddResult(base_test_result.BaseTestResult(
                   full_test_name, base_test_result.ResultType.PASS,
-                  log=p.before))
+                  log=log))
           elif found == 2:  # re_crash
             results.AddResult(base_test_result.BaseTestResult(
                 full_test_name, base_test_result.ResultType.CRASH,
-                log=p.before))
+                log=log))
             break
           else:  # re_fail
             results.AddResult(base_test_result.BaseTestResult(
-                full_test_name, base_test_result.ResultType.FAIL, log=p.before))
+                full_test_name, base_test_result.ResultType.FAIL, log=log))
     except pexpect.EOF:
       logging.error('Test terminated - EOF')
       # We're here because either the device went offline, or the test harness
       # crashed without outputting the CRASHED marker (crbug.com/175538).
       if not self.adb.IsOnline():
         raise errors.DeviceUnresponsiveError('Device %s went offline.' %
                                              self.device)
       if full_test_name:
         results.AddResult(base_test_result.BaseTestResult(
             full_test_name, base_test_result.ResultType.CRASH, log=p.before))

[frankf, 2013/06/18 00:04:59]

log=log

[scherkus (not reviewing), 2013/06/18 00:41:19]

Done.

     except pexpect.TIMEOUT:
       logging.error('Test terminated after %d second timeout.',
                     self.timeout)
       if full_test_name:
         results.AddResult(base_test_result.BaseTestResult(
             full_test_name, base_test_result.ResultType.TIMEOUT, log=p.before))

[frankf, 2013/06/18 00:04:59]

Same here.

[scherkus (not reviewing), 2013/06/18 00:41:19]

Done.

     finally:
       p.close()
 
     ret_code = self._GetGTestReturnCode()
     if ret_code:
       logging.critical(
           'gtest exit code: %d\npexpect.before: %s\npexpect.after: %s',
           ret_code, p.before, p.after)
 
     return results