# HG changeset patch
# User ohair
# Date 1259166298 28800
# Node ID 365eb44493197ba6846a4fac9c60a78fe147ef3b
# Parent 7f1f76f6ab667d10e91b9a536867dbf69f57fee4
6904183: Fix jdk/test/com/sun/jdi tests to run with -samevm
Reviewed-by: dcubed
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/Makefile
--- a/jdk/test/Makefile Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/Makefile Wed Nov 25 08:24:58 2009 -0800
@@ -536,7 +536,7 @@
# Using samevm has serious problems with these tests
JDK_ALL_TARGETS += jdk_tools1
jdk_tools1: com/sun/jdi
- $(call RunOthervmBatch)
+ $(call RunSamevmBatch)
JDK_ALL_TARGETS += jdk_tools2
jdk_tools2: com/sun/tools sun/jvmstat sun/tools tools vm com/sun/servicetag com/sun/tracing
$(call RunOthervmBatch)
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/ProblemList.txt Wed Nov 25 08:24:58 2009 -0800
@@ -1088,9 +1088,6 @@
# So most if not all tools tests are now being run with "othervm" mode.
# Some of these tools tests have a tendency to use fixed ports, bad idea.
-# Solaris 10 client x86, java.lang.IndexOutOfBoundsException resumer Interrupted
-com/sun/jdi/SimulResumerTest.java generic-all
-
# Output of jps differs from expected output.
# Invalid argument count on solaris-sparc and x64
sun/tools/jstatd/jstatdPort.sh generic-all
@@ -1105,9 +1102,6 @@
# Server name error, port 2098 problem?
sun/tools/jstatd/jstatdServerName.sh generic-all
-# Solaris, handshake failed, othervm mode
-com/sun/jdi/RedefineException.sh generic-all
-
# These tests fail on solaris sparc, all the time
com/sun/servicetag/DeleteServiceTag.java generic-all
com/sun/servicetag/DuplicateNotFound.java generic-all
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/BadHandshakeTest.java
--- a/jdk/test/com/sun/jdi/BadHandshakeTest.java Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/BadHandshakeTest.java Wed Nov 25 08:24:58 2009 -0800
@@ -112,6 +112,8 @@
String arch = System.getProperty("os.arch");
if (arch.equals("sparcv9")) {
exe += "sparcv9/java";
+ } else if (arch.equals("amd64")) {
+ exe += "amd64/java";
} else {
exe += "java";
}
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/DoubleAgentTest.java
--- a/jdk/test/com/sun/jdi/DoubleAgentTest.java Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/DoubleAgentTest.java Wed Nov 25 08:24:58 2009 -0800
@@ -94,6 +94,8 @@
String arch = System.getProperty("os.arch");
if (arch.equals("sparcv9")) {
exe += "sparcv9/java";
+ } else if (arch.equals("amd64")) {
+ exe += "amd64/java";
} else {
exe += "java";
}
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/ExclusiveBind.java
--- a/jdk/test/com/sun/jdi/ExclusiveBind.java Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/ExclusiveBind.java Wed Nov 25 08:24:58 2009 -0800
@@ -101,6 +101,8 @@
String arch = System.getProperty("os.arch");
if (arch.equals("sparcv9")) {
exe += "sparcv9/java";
+ } else if (arch.equals("amd64")) {
+ exe += "amd64/java";
} else {
exe += "java";
}
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/JITDebug.sh
--- a/jdk/test/com/sun/jdi/JITDebug.sh Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/JITDebug.sh Wed Nov 25 08:24:58 2009 -0800
@@ -103,10 +103,10 @@
#if running standalone (no test harness of any kind), compile the
#support files and the test case
${TESTJAVA}/bin/javac -d ${TESTCLASSES} \
- -classpath "$TESTJAVA/lib/tools.jar${PATHSEP}." \
+ -classpath "$TESTJAVA/lib/tools.jar${PATHSEP}${TESTSRC}" \
TestScaffold.java VMConnection.java TargetListener.java TargetAdapter.java
${TESTJAVA}/bin/javac -d ${TESTCLASSES} \
- -classpath "$TESTJAVA/lib/tools.jar${PATHSEP}." -g \
+ -classpath "$TESTJAVA/lib/tools.jar${PATHSEP}${TESTSRC}" -g \
JITDebug.java
fi
echo "JDK under test is: $TESTJAVA"
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/RepStep.java
--- a/jdk/test/com/sun/jdi/RepStep.java Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/RepStep.java Wed Nov 25 08:24:58 2009 -0800
@@ -29,7 +29,7 @@
* @run compile -g RepStepTarg.java
* @run build VMConnection RepStep
*
- * @run main RepStep
+ * @run main/othervm RepStep
*
* @summary RepStep detects missed step events due to lack of
* frame pop events (in back-end).
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/RunToExit.java
--- a/jdk/test/com/sun/jdi/RunToExit.java Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/RunToExit.java Wed Nov 25 08:24:58 2009 -0800
@@ -26,7 +26,7 @@
* @summary Test that with server=y, when VM runs to System.exit() no error happens
*
* @build VMConnection RunToExit Exit0
- * @run main RunToExit
+ * @run main/othervm RunToExit
*/
import java.io.InputStream;
import java.io.IOException;
@@ -117,6 +117,8 @@
String arch = System.getProperty("os.arch");
if (arch.equals("sparcv9")) {
exe += "sparcv9/java";
+ } else if (arch.equals("amd64")) {
+ exe += "amd64/java";
} else {
exe += "java";
}
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/SimulResumerTest.java
--- a/jdk/test/com/sun/jdi/SimulResumerTest.java Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/SimulResumerTest.java Wed Nov 25 08:24:58 2009 -0800
@@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g SimulResumerTest.java
- * @run main SimulResumerTest
+ * @run main/othervm SimulResumerTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh
--- a/jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh Wed Nov 25 08:24:58 2009 -0800
@@ -164,10 +164,10 @@
if [ -n "${STANDALONE}" ] ; then
#if running standalone, compile the support files
${TESTJAVA}/bin/javac -d ${TESTCLASSES} \
- -classpath "$TESTJAVA/lib/tools.jar${PATHSEP}." \
+ -classpath "$TESTJAVA/lib/tools.jar${PATHSEP}${TESTSRC}" \
TestScaffold.java VMConnection.java TargetListener.java TargetAdapter.java
${TESTJAVA}/bin/javac -d ${TESTCLASSES} \
- -classpath "$TESTJAVA/lib/tools.jar${PATHSEP}." -g \
+ -classpath "$TESTJAVA/lib/tools.jar${PATHSEP}${TESTSRC}" -g \
FetchLocals.java DataModelTest.java
fi
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/VMConnection.java
--- a/jdk/test/com/sun/jdi/VMConnection.java Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/VMConnection.java Wed Nov 25 08:24:58 2009 -0800
@@ -57,6 +57,7 @@
if (testClasses == null) {
return retVal;
}
+ retVal += "-classpath " + testClasses + " ";
File myFile = new File(testClasses, "@debuggeeVMOptions");
if (!myFile.canRead()) {
@@ -97,7 +98,7 @@
if (line.length() != 0 && !line.startsWith("#")) {
System.out.println("-- Added debuggeeVM options from file " +
wholePath + ": " + line);
- retVal = line;
+ retVal += line;
break;
}
// Else, read he next line.
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java
--- a/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java Wed Nov 25 08:24:58 2009 -0800
@@ -28,7 +28,7 @@
* This tests launches a debuggee using a custom LaunchingConnector.
*
* @build DebugUsingCustomConnector SimpleLaunchingConnector Foo NullTransportService
- * @run main DebugUsingCustomConnector
+ * @run main/othervm DebugUsingCustomConnector
*/
import com.sun.jdi.*;
import com.sun.jdi.connect.*;
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java
--- a/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java Wed Nov 25 08:24:58 2009 -0800
@@ -31,7 +31,7 @@
* created and that they have an "address" argument.
*
* @build GeneratedConnectors NullTransportService
- * @run main GeneratedConnectors
+ * @run main/othervm GeneratedConnectors
*/
import com.sun.jdi.*;
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java
--- a/jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java Wed Nov 25 08:24:58 2009 -0800
@@ -147,11 +147,15 @@
String arch = System.getProperty("os.arch");
if (arch.equals("sparcv9")) {
exe += "sparcv9/java";
+ } else if (arch.equals("amd64")) {
+ exe += "amd64/java";
} else {
exe += "java";
}
String cmd = exe + " -Xdebug -Xrunjdwp:transport=dt_socket,timeout=15000,address=" +
- key.address() + "" + className;
+ key.address() +
+ " -classpath " + System.getProperty("test.classes") +
+ " " + className;
Process process = Runtime.getRuntime().exec(cmd);
Connection conn = ts.accept(key, 30*1000, 9*1000);
ts.stopListening(key);
diff -r 7f1f76f6ab66 -r 365eb4449319 jdk/test/com/sun/jdi/redefine/RedefineTest.java
--- a/jdk/test/com/sun/jdi/redefine/RedefineTest.java Mon Nov 23 19:57:01 2009 -0800
+++ b/jdk/test/com/sun/jdi/redefine/RedefineTest.java Wed Nov 25 08:24:58 2009 -0800
@@ -34,7 +34,7 @@
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g RedefineTest.java
* @run shell RedefineSetUp.sh
- * @run main RedefineTest
+ * @run main/othervm RedefineTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;