Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Unified Diff: build/android/pylib/linker/test_case.py

Issue 2605793002: [android] Convert linker tests to platform mode. (Closed)
Patch Set: mikecase comment Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/linker/setup.py ('k') | build/android/pylib/linker/test_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/linker/test_case.py
diff --git a/build/android/pylib/linker/test_case.py b/build/android/pylib/linker/test_case.py
index 475b730c4a16ab869e07292736908d41bb1a2ac0..f4ae7c6562e2d956db7ce82886b0ad3f2f0422cd 100644
--- a/build/android/pylib/linker/test_case.py
+++ b/build/android/pylib/linker/test_case.py
@@ -94,7 +94,10 @@ def _StartActivityAndWaitForLinkerTestStatus(device, timeout):
except device_errors.CommandTimeoutError:
result = ResultType.TIMEOUT
- return result, '\n'.join(device.adb.Logcat(dump=True))
+ logcat = device.adb.Logcat(dump=True)
+
+ logmon.Close()
+ return result, '\n'.join(logcat)
class LibraryLoadMap(dict):
@@ -182,14 +185,8 @@ class LinkerTestCaseBase(object):
result_text = 'TIMEOUT'
print '[ %*s ] %s' % (margin, result_text, self.tagged_name)
- results = base_test_result.TestRunResults()
- results.AddResult(
- base_test_result.BaseTestResult(
- self.tagged_name,
- status,
- log=logs))
+ return base_test_result.BaseTestResult(self.tagged_name, status, log=logs)
- return results
def __str__(self):
return self.tagged_name
« no previous file with comments | « build/android/pylib/linker/setup.py ('k') | build/android/pylib/linker/test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698