summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2010-03-23 16:09:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-23 16:09:29 -0700
commit4cc5052e494d3fb7a54b91fb06eb1758ced13e9c (patch)
tree0cc403e9eb4620117e6015be0e115dda6010e088
parent2aa1a602699816e263af6f24e0d8c53edc1e28c4 (diff)
parentc7b12901489d3be1e730909633fe07c5e014983e (diff)
downloadlibcore-4cc5052e494d3fb7a54b91fb06eb1758ced13e9c.zip
libcore-4cc5052e494d3fb7a54b91fb06eb1758ced13e9c.tar.gz
libcore-4cc5052e494d3fb7a54b91fb06eb1758ced13e9c.tar.bz2
Merge "Fix --debug-port to --debug in vogar usage" into dalvik-dev
-rw-r--r--tools/runner/java/dalvik/runner/DalvikRunner.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/runner/java/dalvik/runner/DalvikRunner.java b/tools/runner/java/dalvik/runner/DalvikRunner.java
index 34331f2..86c0129 100644
--- a/tools/runner/java/dalvik/runner/DalvikRunner.java
+++ b/tools/runner/java/dalvik/runner/DalvikRunner.java
@@ -135,7 +135,7 @@ public final class DalvikRunner {
System.out.println();
System.out.println(" --timeout-seconds <seconds>: maximum execution time of each");
System.out.println(" test before the runner aborts it. Specifying zero seconds");
- System.out.println(" or using --debug-port will disable the execution timeout");
+ System.out.println(" or using --debug will disable the execution timeout");
System.out.println(" Default is: " + timeoutSeconds);
System.out.println();
System.out.println(" --xml-reports-directory <path>: directory to emit JUnit-style");