Index: build/android/pylib/gtest/test_package.py |
diff --git a/build/android/pylib/gtest/test_package.py b/build/android/pylib/gtest/test_package.py |
index 9ba7c1c6f67f52c0bf97902a36facac55e848af5..490ecd3ffc4d55de9c91f27fd833d101f3b29ef5 100644 |
--- a/build/android/pylib/gtest/test_package.py |
+++ b/build/android/pylib/gtest/test_package.py |
@@ -179,13 +179,15 @@ class TestPackage(object): |
self.device) |
if full_test_name: |
results.AddResult(base_test_result.BaseTestResult( |
- full_test_name, base_test_result.ResultType.CRASH, log=log)) |
+ full_test_name, base_test_result.ResultType.CRASH, |
+ log=p.before.replace('\r', ''))) |
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=log)) |
+ full_test_name, base_test_result.ResultType.TIMEOUT, |
+ log=p.before.replace('\r', ''))) |
finally: |
p.close() |