summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/android/pylib/gtest/test_package.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/build/android/pylib/gtest/test_package.py b/build/android/pylib/gtest/test_package.py
index 9ba7c1c..490ecd3 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()