| Index: build/android/pylib/local/device/local_device_instrumentation_test_run.py
|
| diff --git a/build/android/pylib/local/device/local_device_instrumentation_test_run.py b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
|
| index 8fb78feb36b598f78fa82acd6de42e8b7a55d581..08ae4f35d971590dbe728177c8764b3c669d6411 100644
|
| --- a/build/android/pylib/local/device/local_device_instrumentation_test_run.py
|
| +++ b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
|
| @@ -339,16 +339,21 @@ class LocalDeviceInstrumentationTestRun(
|
| device.RunShellCommand('rm -f %s' % os.path.join(coverage_directory,
|
| '*'))
|
| 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)
|
| return results, None
|
|
|
| #override
|
|
|