Index: build/android/test_runner.py |
diff --git a/build/android/test_runner.py b/build/android/test_runner.py |
index 23c403995953224f97282d1639d12c9c49c6600c..1b7c88c940ccbf6e63856e5e9748b88aa94b464a 100755 |
--- a/build/android/test_runner.py |
+++ b/build/android/test_runner.py |
@@ -856,21 +856,28 @@ def RunTestsInPlatformMode(args): |
lambda: collections.defaultdict(int)) |
iteration_count = 0 |
for _ in repetitions: |
- iteration_results = test_run.RunTests() |
- if iteration_results is not None: |
- iteration_count += 1 |
- results.append(iteration_results) |
- for r in iteration_results.GetAll(): |
- result_counts[r.GetName()][r.GetType()] += 1 |
- report_results.LogFull( |
- results=iteration_results, |
- test_type=test.TestType(), |
- test_package=test_run.TestPackage(), |
- annotation=getattr(args, 'annotations', None), |
- flakiness_server=getattr(args, 'flakiness_dashboard_server', |
- None)) |
- if args.break_on_failure and not iteration_results.DidRunPass(): |
- break |
+ raw_results = test_run.RunTests() |
+ if not raw_results: |
+ continue |
+ |
+ results.extend(raw_results) |
mikecase (-- gone --)
2016/05/13 17:45:34
My only question I guess would be will the Generat
jbudorick
2016/05/13 17:59:10
It should: https://code.google.com/p/chromium/code
|
+ |
+ iteration_results = base_test_result.TestRunResults() |
+ for r in raw_results: |
+ iteration_results.AddTestRunResults(r) |
mikecase (-- gone --)
2016/05/13 17:32:13
I find this pretty confusing. So, just to make sur
jbudorick
2016/05/13 17:37:05
No, raw_results is a list of base_test_result.Test
|
+ |
+ iteration_count += 1 |
+ for r in iteration_results.GetAll(): |
+ result_counts[r.GetName()][r.GetType()] += 1 |
+ report_results.LogFull( |
+ results=iteration_results, |
+ test_type=test.TestType(), |
+ test_package=test_run.TestPackage(), |
+ annotation=getattr(args, 'annotations', None), |
+ flakiness_server=getattr(args, 'flakiness_dashboard_server', |
+ None)) |
+ if args.break_on_failure and not iteration_results.DidRunPass(): |
+ break |
if iteration_count > 1: |
# display summary results |