diff --git a/test/Makefile b/test/Makefile index c5a982972b1a4a065a6422b42fa4edf318fa30d3..b6fee3c59e227a44e0d143b72e9c2a99d357e0d7 100644 --- a/test/Makefile +++ b/test/Makefile @@ -536,7 +536,7 @@ jdk_text: java/text sun/text # 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 --git a/test/ProblemList.txt b/test/ProblemList.txt index d9620c8b28f5533a9344d3bad4b40284904b81c7..1867d67a21860f376ec818b6c13b996778178621 100644 --- a/test/ProblemList.txt +++ b/test/ProblemList.txt @@ -1088,9 +1088,6 @@ java/text/Bidi/Bug6665028.java linux-x64 # 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 @@ sun/tools/jps/jps-m_2.sh generic-all # 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 --git a/test/com/sun/jdi/BadHandshakeTest.java b/test/com/sun/jdi/BadHandshakeTest.java index d5ecd0a73b84d7a07c7f94912c6b13c421309043..6601b427230001d48c2c9737c683a2b7ff8f4059 100644 --- a/test/com/sun/jdi/BadHandshakeTest.java +++ b/test/com/sun/jdi/BadHandshakeTest.java @@ -112,6 +112,8 @@ public class BadHandshakeTest { 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 --git a/test/com/sun/jdi/DoubleAgentTest.java b/test/com/sun/jdi/DoubleAgentTest.java index 77c72cb08fddd26990e781a9d5e1989586d0fb77..f76b17c154e193ddc49d68fd74fe1fcf64446d5a 100644 --- a/test/com/sun/jdi/DoubleAgentTest.java +++ b/test/com/sun/jdi/DoubleAgentTest.java @@ -94,6 +94,8 @@ public class DoubleAgentTest { 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 --git a/test/com/sun/jdi/ExclusiveBind.java b/test/com/sun/jdi/ExclusiveBind.java index ca2ba0229ec0d7019f6476f6f8ec612a7fa1924a..0f56d072e2d9a6723e2988cb8e77c01206abb308 100644 --- a/test/com/sun/jdi/ExclusiveBind.java +++ b/test/com/sun/jdi/ExclusiveBind.java @@ -101,6 +101,8 @@ public class ExclusiveBind { 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 --git a/test/com/sun/jdi/JITDebug.sh b/test/com/sun/jdi/JITDebug.sh index 33aaa471fd33342b86a0843dc4474dae2ce4ad38..637c6deabd304986ffe0131e1c585ebbef1b13e3 100644 --- a/test/com/sun/jdi/JITDebug.sh +++ b/test/com/sun/jdi/JITDebug.sh @@ -103,10 +103,10 @@ if [ -z "${TESTJAVA}" ] ; then #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 --git a/test/com/sun/jdi/RepStep.java b/test/com/sun/jdi/RepStep.java index da058b2a3e11e92d776b0269f498d91021af208d..840ebb38427f7899116bd7c551cc037a60f2f4d6 100644 --- a/test/com/sun/jdi/RepStep.java +++ b/test/com/sun/jdi/RepStep.java @@ -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 --git a/test/com/sun/jdi/RunToExit.java b/test/com/sun/jdi/RunToExit.java index 947bcb26f976602aff825bdd68956ecedbf80ca2..9495e4516693a2121cb733d9ed6d15e02cb6443b 100644 --- a/test/com/sun/jdi/RunToExit.java +++ b/test/com/sun/jdi/RunToExit.java @@ -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 @@ public class RunToExit { 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 --git a/test/com/sun/jdi/SimulResumerTest.java b/test/com/sun/jdi/SimulResumerTest.java index cf7568e8be0912f7089f3a9252adf5f400460045..c0f54f806d8987f6f03f73e2a4c0210f53f27e82 100644 --- a/test/com/sun/jdi/SimulResumerTest.java +++ b/test/com/sun/jdi/SimulResumerTest.java @@ -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 --git a/test/com/sun/jdi/Solaris32AndSolaris64Test.sh b/test/com/sun/jdi/Solaris32AndSolaris64Test.sh index c1b4491a706f33f824641a824161cd08da91f818..c70dd465c3aed3b83d436cee6b3452d094ff6019 100644 --- a/test/com/sun/jdi/Solaris32AndSolaris64Test.sh +++ b/test/com/sun/jdi/Solaris32AndSolaris64Test.sh @@ -164,10 +164,10 @@ fi 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 --git a/test/com/sun/jdi/VMConnection.java b/test/com/sun/jdi/VMConnection.java index 5d5f9e13bb679b7f94e47c2fa816c5d30af091f0..bc07e034691a3818209f6c041db0b1b8186be1a4 100644 --- a/test/com/sun/jdi/VMConnection.java +++ b/test/com/sun/jdi/VMConnection.java @@ -57,6 +57,7 @@ class VMConnection { if (testClasses == null) { return retVal; } + retVal += "-classpath " + testClasses + " "; File myFile = new File(testClasses, "@debuggeeVMOptions"); if (!myFile.canRead()) { @@ -97,7 +98,7 @@ class VMConnection { 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 --git a/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java b/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java index d8c939e58c44c1f97b5ea6e768777f45e2bed475..3073093f7405b537d2f3371c9bfbe67b29ab43c3 100644 --- a/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java +++ b/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java @@ -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 --git a/test/com/sun/jdi/connect/spi/GeneratedConnectors.java b/test/com/sun/jdi/connect/spi/GeneratedConnectors.java index d4926396ebed05a34bf2122e4dc2e27b92aa6a2b..e9dba8332ff259e58ed07c72aad7aca83a37fbdd 100644 --- a/test/com/sun/jdi/connect/spi/GeneratedConnectors.java +++ b/test/com/sun/jdi/connect/spi/GeneratedConnectors.java @@ -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 --git a/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java b/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java index 86154d5091df90d7ce53ecf0b92d56716010cb2c..858cbc711870e04b6e44f9c2792a0190bd842941 100644 --- a/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java +++ b/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java @@ -147,11 +147,15 @@ public class SimpleLaunchingConnector implements LaunchingConnector { 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 --git a/test/com/sun/jdi/redefine/RedefineTest.java b/test/com/sun/jdi/redefine/RedefineTest.java index e5980d59fd658bd52f1a8cc186bf569fada954a7..809e9db1b84980e971e7c83b449393a99e4c3434 100644 --- a/test/com/sun/jdi/redefine/RedefineTest.java +++ b/test/com/sun/jdi/redefine/RedefineTest.java @@ -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.*;