summaryrefslogtreecommitdiffstats
path: root/build/android/pylib
diff options
context:
space:
mode:
Diffstat (limited to 'build/android/pylib')
-rw-r--r--build/android/pylib/android_commands.py4
-rw-r--r--build/android/pylib/test_result.py10
2 files changed, 13 insertions, 1 deletions
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index e665a65..127c2fa 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -1021,7 +1021,9 @@ class AndroidCommands(object):
'--throttle %d' % throttle,
'-s %d' % seed,
'-v ' * verbosity,
+ '--monitor-native-crashes',
+ '--kill-process-after-error',
extra_args,
- '%s' % event_count]
+ '%d' % event_count]
return self.RunShellCommand(' '.join(cmd),
timeout_time=event_count*throttle*1.5)
diff --git a/build/android/pylib/test_result.py b/build/android/pylib/test_result.py
index 6c2fad0..043cb48 100644
--- a/build/android/pylib/test_result.py
+++ b/build/android/pylib/test_result.py
@@ -9,6 +9,7 @@ import os
import time
import traceback
+import buildbot_report
import constants
@@ -193,3 +194,12 @@ class TestResults(object):
[t.name for t in self.unknown])
logging.critical(summary_string)
return summary_string
+
+ def PrintAnnotation(self):
+ """Print buildbot annotations for test results."""
+ if self.timed_out:
+ buildbot_report.PrintWarning()
+ elif self.failed or self.crashed or self.overall_fail:
+ buildbot_report.PrintError()
+ else:
+ print 'Step success!' # No annotation needed