--- old/test/com/sun/jdi/ProcessAttachTest.sh 2014-01-26 11:36:33.372797952 +0800 +++ new/test/com/sun/jdi/ProcessAttachTest.sh 2014-01-26 11:36:33.232797953 +0800 @@ -70,7 +70,7 @@ startDebuggee() { OUTPUTFILE=${TESTCLASSES}/Debuggee.out - ${JAVA} "$@" > ${OUTPUTFILE} & + ${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} "$@" > ${OUTPUTFILE} & startpid="$!" pid="${startpid}" @@ -107,7 +107,7 @@ stopDebuggee() { - $JAVA -classpath "${TESTCLASSES}" ShutdownDebuggee $1 + $JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTCLASSES}" ShutdownDebuggee $1 if [ $? != 0 ] ; then echo "Error: ShutdownDebuggee failed" failures=`expr $failures + 1` @@ -134,7 +134,7 @@ -agentlib:jdwp=transport=dt_socket,server=y,suspend=n \ -classpath "${TESTCLASSES}" ProcessAttachDebuggee "${PORTFILE}" -$JAVA -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \ +$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \ ProcessAttachDebugger $pid 2>&1 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi @@ -152,7 +152,7 @@ -agentlib:jdwp=transport=dt_socket,server=y,suspend=y \ -classpath "${TESTCLASSES}" ProcessAttachDebuggee "${PORTFILE}" -$JAVA -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \ +$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \ ProcessAttachDebugger $pid 2>&1 # The debuggee is suspended and doesn't run until the debugger