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..43cb31e6b31d156695e096e8ca5669b25151523e 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 |
| @@ -6,6 +6,7 @@ import logging |
| import os |
| import posixpath |
| import re |
| +import subprocess |
| import time |
| from devil.android import device_errors |
| @@ -16,7 +17,6 @@ from pylib.base import base_test_result |
| from pylib.local.device import local_device_environment |
| from pylib.local.device import local_device_test_run |
| - |
| TIMEOUT_ANNOTATIONS = [ |
| ('Manual', 10 * 60 * 60), |
| ('IntegrationTest', 30 * 60), |
| @@ -143,6 +143,10 @@ class LocalDeviceInstrumentationTestRun( |
| else: |
| for step in steps: |
| step() |
| + if self._test_instance.tombstones: |
| + subprocess.check_call(['python', |
|
jbudorick
2016/08/01 17:39:18
This isn't how we should be using tombstones. Inst
BigBossZhiling
2016/08/01 22:35:13
Done.
|
| + 'build/android/tombstones.py', |
| + '--erase-all-with-noprocess']) |
| self._env.parallel_devices.pMap( |
| individual_device_set_up, |
| @@ -329,6 +333,14 @@ class LocalDeviceInstrumentationTestRun( |
| self._test_instance.coverage_directory) |
| device.RunShellCommand('rm -f %s' % os.path.join(coverage_directory, |
| '*')) |
| + if self._test_instance.tombstones: |
| + for result in results: |
| + if result.GetType() == base_test_result.ResultType.CRASH: |
| + tombstones = subprocess.check_output(['python', |
|
jbudorick
2016/08/01 17:39:18
Same as above.
BigBossZhiling
2016/08/01 22:35:13
Done.
|
| + 'build/android/tombstones.py', |
| + '-a', |
| + '-w']) |
| + result.set_tombstones(tombstones) |
| return results |
| #override |