Merge "JDWP: allow to set debuggee classpath"
am: 074307c9f9
Change-Id: I58b5bb55b52f55b3c6346e2b3b49a9eee7f22b18
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java
index 59f3282..3070dd9 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java
@@ -47,6 +47,8 @@
* - name of agent native library
* <li><code>jpda.settings.debuggeeAgentExtraOptions</code>
* - extra options for agent
+ * <li><code>jpda.settings.debuggeeClasspath</code>
+ * - classpath to run debuggee with
* <li><code>jpda.settings.debuggeeClassName</code>
* - full name of class to run debuggee with
* <li><code>jpda.settings.debuggeeVMExtraOptions</code>
@@ -221,10 +223,11 @@
/**
* Returns VM classpath value to run debuggee with.
*
- * @return system property "java.class.path" by default.
+ * @return option "jpda.settings.debuggeeClasspath" or system property "java.class.path" by
+ * default.
*/
public String getDebuggeeClassPath() {
- return getProperty("java.class.path", null);
+ return getProperty("jpda.settings.debuggeeClasspath", getProperty("java.class.path", null));
}
/**
