LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support for ignoring or exit running when native crashes.

Browse Source 
http://b/issue?id=2359586
with this CL, if --monitor-native-crashes is set and --ignore-native-crashes
is not set, monkey will exit when a native crash occurs.

Change-Id: I07ab17b5430ed090d8fb6286fdc793bac1b2caa9
This commit is contained in:
Ying Wang
2010-03-09 13:25:11 -08:00
parent 042e90a587
commit df78cdf2d3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmds/monkey/src/com/android/commands/monkey/Monkey.java
View File

@@ -91,6 +91,9 @@ public class Monkey {
/** Monitor /data/tombstones and stop the monkey if new files appear. */ /** Monitor /data/tombstones and stop the monkey if new files appear. */
private boolean mMonitorNativeCrashes; private boolean mMonitorNativeCrashes;
/** Ignore any native crashes while running? */
private boolean mIgnoreNativeCrashes;
/** Send no events. Use with long throttle-time to watch user operations */ /** Send no events. Use with long throttle-time to watch user operations */
private boolean mSendNoEvents; private boolean mSendNoEvents;
@@ -578,6 +581,8 @@ public class Monkey {
mIgnoreSecurityExceptions = true; mIgnoreSecurityExceptions = true;
} else if (opt.equals("--monitor-native-crashes")) { } else if (opt.equals("--monitor-native-crashes")) {
mMonitorNativeCrashes = true; mMonitorNativeCrashes = true;
} else if (opt.equals("--ignore-native-crashes")) {
mIgnoreNativeCrashes = true;
} else if (opt.equals("--kill-process-after-error")) { } else if (opt.equals("--kill-process-after-error")) {
mKillProcessAfterError = true; mKillProcessAfterError = true;
} else if (opt.equals("--hprof")) { } else if (opt.equals("--hprof")) {
@@ -860,7 +865,7 @@ public class Monkey {
// the watcher (ignore the error) // the watcher (ignore the error)
if (checkNativeCrashes() && (eventCounter > 0)) { if (checkNativeCrashes() && (eventCounter > 0)) {
System.out.println("** New native crash detected."); System.out.println("** New native crash detected.");
mAbort = mAbort || mKillProcessAfterError; mAbort = mAbort || !mIgnoreNativeCrashes || mKillProcessAfterError;
} }
} }
if (mAbort) { if (mAbort) {
@@ -1071,7 +1076,8 @@ public class Monkey {
usage.append("usage: monkey [-p ALLOWED_PACKAGE [-p ALLOWED_PACKAGE] ...]\n"); usage.append("usage: monkey [-p ALLOWED_PACKAGE [-p ALLOWED_PACKAGE] ...]\n");
usage.append(" [-c MAIN_CATEGORY [-c MAIN_CATEGORY] ...]\n"); usage.append(" [-c MAIN_CATEGORY [-c MAIN_CATEGORY] ...]\n");
usage.append(" [--ignore-crashes] [--ignore-timeouts]\n"); usage.append(" [--ignore-crashes] [--ignore-timeouts]\n");
usage.append(" [--ignore-security-exceptions] [--monitor-native-crashes]\n"); usage.append(" [--ignore-security-exceptions]\n");
usage.append(" [--monitor-native-crashes] [--ignore-native-crashes]\n");
usage.append(" [--kill-process-after-error] [--hprof]\n"); usage.append(" [--kill-process-after-error] [--hprof]\n");
usage.append(" [--pct-touch PERCENT] [--pct-motion PERCENT]\n"); usage.append(" [--pct-touch PERCENT] [--pct-motion PERCENT]\n");
usage.append(" [--pct-trackball PERCENT] [--pct-syskeys PERCENT]\n"); usage.append(" [--pct-trackball PERCENT] [--pct-syskeys PERCENT]\n");