diff options
| author | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 10:17:32 +0000 |
|---|---|---|
| committer | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 10:17:32 +0000 |
| commit | 6edd61cce39b3778765af46627ef235551370077 (patch) | |
| tree | 4e22c562babc63981441df10c06ae0fa30f53141 /build | |
| parent | 2ce9836f13b153bde4eda494e863b62655deb7af (diff) | |
| download | chromium_src-6edd61cce39b3778765af46627ef235551370077.zip chromium_src-6edd61cce39b3778765af46627ef235551370077.tar.gz chromium_src-6edd61cce39b3778765af46627ef235551370077.tar.bz2 | |
[Android] Fix _WatchTestOutput after r207099
BUG=
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/17288008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/gtest/test_package.py | 6 |
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() |