Chromium Code Reviews| 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 26d10f4d1d7ed797a4682a0acae6ff13b382281e..97e962c03aaf2608c9b23c9b1bc9b64f9bc19ee6 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 |
| @@ -15,7 +15,7 @@ from pylib import valgrind_tools |
| from pylib.base import base_test_result |
| from pylib.local.device import local_device_environment |
| from pylib.local.device import local_device_test_run |
| - |
| +import tombstones |
| TIMEOUT_ANNOTATIONS = [ |
| ('Manual', 10 * 60 * 60), |
| @@ -143,6 +143,8 @@ class LocalDeviceInstrumentationTestRun( |
| else: |
| for step in steps: |
| step() |
| + if self._test_instance.store_tombstones: |
| + tombstones.ClearAllTombstones(dev) |
| self._env.parallel_devices.pMap( |
| individual_device_set_up, |
| @@ -329,6 +331,15 @@ class LocalDeviceInstrumentationTestRun( |
| self._test_instance.coverage_directory) |
| device.RunShellCommand('rm -f %s' % os.path.join(coverage_directory, |
| '*')) |
| + if self._test_instance.store_tombstones: |
| + for result in results: |
| + if result.GetType() == base_test_result.ResultType.CRASH: |
| + resolved_tombstones = tombstones.ResolveTombstones( |
|
jbudorick
2016/08/09 22:28:47
This will need to be updated to handle a list of l
BigBossZhiling
2016/08/09 23:49:26
Done.
|
| + device, |
| + resolve_all_tombstones=True, |
| + include_stack_symbols=False, |
| + wipe_tombstones=True) |
| + result.SetTombstones(resolved_tombstones) |
| return results |
| #override |