| Index: build/android/pylib/local/device/local_device_gtest_run.py
|
| diff --git a/build/android/pylib/local/device/local_device_gtest_run.py b/build/android/pylib/local/device/local_device_gtest_run.py
|
| index a04b6a2de47ae45e99afa384cb3ce7b0b96716c6..b25b176250d0e915a449c0d160d23fd55952a0db 100644
|
| --- a/build/android/pylib/local/device/local_device_gtest_run.py
|
| +++ b/build/android/pylib/local/device/local_device_gtest_run.py
|
| @@ -7,6 +7,7 @@ import itertools
|
| import logging
|
| import os
|
| import posixpath
|
| +import time
|
|
|
| from devil.android import device_errors
|
| from devil.android import device_temp_file
|
| @@ -414,16 +415,21 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
|
| if r.GetType() == base_test_result.ResultType.CRASH)
|
|
|
| if self._test_instance.store_tombstones:
|
| - resolved_tombstones = None
|
| + tombstones_url = None
|
| for result in results:
|
| if result.GetType() == base_test_result.ResultType.CRASH:
|
| - if not resolved_tombstones:
|
| - resolved_tombstones = '\n'.join(tombstones.ResolveTombstones(
|
| + if not tombstones_url:
|
| + resolved_tombstones = tombstones.ResolveTombstones(
|
| device,
|
| resolve_all_tombstones=True,
|
| include_stack_symbols=False,
|
| - wipe_tombstones=True))
|
| - result.SetTombstones(resolved_tombstones)
|
| + wipe_tombstones=True)
|
| + stream_name = 'tombstones_%s_%s' % (
|
| + time.strftime('%Y%m%dT%H%M%S', time.localtime()),
|
| + device.serial)
|
| + tombstones_url = tombstones.LogdogTombstones(resolved_tombstones,
|
| + stream_name)
|
| + result.SetTombstonesUrl(tombstones_url)
|
|
|
| not_run_tests = set(test).difference(set(r.GetName() for r in results))
|
| return results, list(not_run_tests)
|
|
|