Index: build/android/pylib/instrumentation/instrumentation_test_instance.py |
diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py |
index 62e62b8034a77649bb69cf741d092d57960f916f..6b8f03f428a14a2b4a7bf4d94427b2c9ef47a665 100644 |
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py |
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py |
@@ -48,7 +48,7 @@ _EXTRA_TIMEOUT_SCALE = ( |
_PARAMETERIZED_TEST_ANNOTATION = 'ParameterizedTest' |
_PARAMETERIZED_TEST_SET_ANNOTATION = 'ParameterizedTest$Set' |
-_NATIVE_CRASH_RE = re.compile('native crash', re.IGNORECASE) |
+_CRASH_RE = re.compile('(process|native) crash', re.IGNORECASE) |
jbudorick
2016/08/04 01:23:53
er, nit: this should still be _NATIVE_CRASH_RE, as
BigBossZhiling
2016/08/04 22:30:34
Done.
|
_PICKLE_FORMAT_VERSION = 10 |
@@ -142,7 +142,7 @@ def GenerateTestResults( |
if current_result: |
if current_result.GetType() == base_test_result.ResultType.UNKNOWN: |
crashed = (result_code == _ACTIVITY_RESULT_CANCELED |
- and any(_NATIVE_CRASH_RE.search(l) |
+ and any(_CRASH_RE.search(l) |
for l in result_bundle.itervalues())) |
if crashed: |
current_result.SetType(base_test_result.ResultType.CRASH) |