Index: openide/build.xml
===================================================================
RCS file: /cvs/openide/build.xml,v
retrieving revision 1.171
diff -u -r1.171 build.xml
--- openide/build.xml	29 Apr 2004 12:58:47 -0000	1.171
+++ openide/build.xml	29 Apr 2004 16:39:45 -0000
@@ -778,6 +778,24 @@
         </ant>
     </target>
     
+    <target name="debug-test-single-nb" depends="init" if="netbeans.home" >
+        <fail unless="test.class">Must set test.class</fail>
+        <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="${test.class}">
+            <classpath> 
+                <pathelement location="${netbeans.dest.dir}/${cluster.dir}/${module.jar}"/>
+                <pathelement location="test/src" />
+                <fileset dir="${netbeans.dest.dir}" >
+                    <patternset refid="openide.files" />
+                </fileset>
+            </classpath>
+        </nbjpdastart>
+        <antcall target="test-single" inheritall="true" >
+            <param name="test.includes" value="${test.class}" />
+            <param name="xtest.debug.address" value="${jpda.address}" />
+        </antcall>
+    </target>
+
+    
     <!-- be able to execute all unit tests -->
     <target name="test" >
         <ant dir="test" />
Index: xtest/plugins_src/jvm/lib/jvm_execution_targets.xml
===================================================================
RCS file: /cvs/xtest/plugins_src/jvm/lib/jvm_execution_targets.xml,v
retrieving revision 1.5
diff -u -r1.5 jvm_execution_targets.xml
--- xtest/plugins_src/jvm/lib/jvm_execution_targets.xml	20 Apr 2004 12:38:26 -0000	1.5
+++ xtest/plugins_src/jvm/lib/jvm_execution_targets.xml	29 Apr 2004 16:39:57 -0000
@@ -62,9 +62,11 @@
 
         <property name="xtest.testrunner.mode" value="testsuite"/>        
 
+        <property name="xtest.debug.address" value="" />
         <!-- run the tests -->        
         <jvmTestRunner workDir="${xtest.workdir}/sys"  jdkHome="${jdkhome}" jvmArgs="${xtest.jvm.args}"
-            enableAssertions="${xtest.enable.assertions}" debugPort="${xtest.debug.port}" debugSuspend="${xtest.debug.suspend}"
+            enableAssertions="${xtest.enable.assertions}" 
+            debugPort="${xtest.debug.port}" debugSuspend="${xtest.debug.suspend}" debugAddress="${xtest.debug.address}"
             testMode="${xtest.testrunner.mode}"  timeout="${xtest.timeout}">
             <classpath  refid="_jvmplugin.test.classpath"/>
 
Index: xtest/plugins_src/jvm/src/org/netbeans/xtest/plugin/jvm/JVMTestRunnerTask.java
===================================================================
RCS file: /cvs/xtest/plugins_src/jvm/src/org/netbeans/xtest/plugin/jvm/JVMTestRunnerTask.java,v
retrieving revision 1.3
diff -u -r1.3 JVMTestRunnerTask.java
--- xtest/plugins_src/jvm/src/org/netbeans/xtest/plugin/jvm/JVMTestRunnerTask.java	10 Apr 2004 11:39:41 -0000	1.3
+++ xtest/plugins_src/jvm/src/org/netbeans/xtest/plugin/jvm/JVMTestRunnerTask.java	29 Apr 2004 16:39:57 -0000
@@ -136,6 +136,12 @@
         this.debugSuspend = suspend;
     }    
     
+    /** Address to attach to
+     */
+    public void setDebugAddress (String address) {
+        this.debugAddress = address;
+    }
+    
     // test mode
     public void setTestMode(String testMode) {
         if ((testMode != null) & (!testMode.equals(""))) {
@@ -198,6 +204,9 @@
     // debug should suspend code execution
     protected boolean debugSuspend = false;
     
+    // debug should start its own server
+    private String debugAddress;
+    
     // debug port to which debugger is connected. When 0 - debugging is not started
     protected int debugPort = 0;
     
@@ -266,12 +275,23 @@
         if (enableAssertions) {
             commandLine.createVmArgument().setValue("-ea");
         }
+        
         // debugger
         if (debugPort > 0) {
+            if (debugAddress != null && debugAddress.length () > 0) {
+                throw new BuildException ("Cannot specify debug port (" + debugPort + ") and address (" + debugAddress + ") at once");
+            }
             String suspendArg = debugSuspend ? "y" : "n";
             String debugArgument = "-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend="+suspendArg+",address="+debugPort;
             commandLine.createVmArgument().setLine(debugArgument);
-        }        
+        } else {        
+            if (debugAddress != null && debugAddress.length () > 0) {
+                String debugArgument = "-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=" + debugAddress;
+                commandLine.createVmArgument().setLine(debugArgument);
+            }
+        }
+        
+        
         // add runnerproperties file sys property
         Environment.Variable runnerProperties = new Environment.Variable();
         runnerProperties.setKey(JUnitTestRunner.TESTRUNNER_PROPERTIES_FILENAME_KEY);