--- old/test/com/oracle/net/sanity.sh	2014-01-26 11:36:30.264797993 +0800
+++ new/test/com/oracle/net/sanity.sh	2014-01-26 11:36:30.124797995 +0800
@@ -63,4 +63,4 @@
 export CLASSPATH
 
 # Run sanity test (IPv4-only for now)
-$JAVA ${TESTVMOPTS} -Djava.net.preferIPv4Stack=true Sanity ${IB_LINKS}
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.net.preferIPv4Stack=true Sanity ${IB_LINKS}
--- old/test/com/sun/corba/5036554/TestCorbaBug.sh	2014-01-26 11:36:30.780797986 +0800
+++ new/test/com/sun/corba/5036554/TestCorbaBug.sh	2014-01-26 11:36:30.640797988 +0800
@@ -70,7 +70,7 @@
 
 THIS_DIR=`pwd`
 
-${TESTJAVA}${FS}bin${FS}java -version
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -version
 
 mkdir bug
 
@@ -81,9 +81,9 @@
 
 chmod -fR 777 bug
 
-${TESTJAVA}${FS}bin${FS}javac -d . bug${FS}*.java
+${TESTJAVA}${FS}bin${FS}javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . bug${FS}*.java
 
-${TESTJAVA}${FS}bin${FS}java -cp . bug/JavaBug > test.out 2>&1 
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp . bug/JavaBug > test.out 2>&1 
 
 grep "NullPointerException" test.out
 
--- old/test/com/sun/corba/cachedSocket/7056731.sh	2014-01-26 11:36:31.288797979 +0800
+++ new/test/com/sun/corba/cachedSocket/7056731.sh	2014-01-26 11:36:31.152797981 +0800
@@ -56,7 +56,7 @@
 echo "Testing...please wait"
 
 ${TESTJAVA}${FS}bin${FS}idlj -fall Hello.idl
-${TESTJAVA}${FS}bin${FS}javac *.java HelloApp/*.java
+${TESTJAVA}${FS}bin${FS}javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} *.java HelloApp/*.java
 
 echo "starting orbd"
 ${TESTJAVA}${FS}bin${FS}orbd -ORBInitialPort $PORT -ORBInitialHost localhost &
@@ -64,12 +64,12 @@
 sleep 2 #give orbd time to start
 echo "started orb"
 echo "starting server"
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp . HelloServer -ORBInitialPort $PORT -ORBInitialHost localhost &
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp . HelloServer -ORBInitialPort $PORT -ORBInitialHost localhost &
 SERVER_PROC=$!
 sleep 2 #give server time to start
 echo "started server"
 echo "starting client (debug mode)"
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp . -agentlib:jdwp=transport=dt_socket,server=y,address=8000 HelloClient -ORBInitialPort $PORT -ORBInitialHost localhost > client.$$ 2>&1 & 
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp . -agentlib:jdwp=transport=dt_socket,server=y,address=8000 HelloClient -ORBInitialPort $PORT -ORBInitialHost localhost > client.$$ 2>&1 & 
 JVM_PROC=$!
 sleep 2 #give jvm/debugger/client time to start
 
--- old/test/com/sun/jdi/ImmutableResourceTest.sh	2014-01-26 11:36:31.812797972 +0800
+++ new/test/com/sun/jdi/ImmutableResourceTest.sh	2014-01-26 11:36:31.664797974 +0800
@@ -100,11 +100,11 @@
 set -vx
 #
 #Compile.  tools.jar is required on the classpath.
-${TESTJAVA}/bin/javac -d "${TESTCLASSES}" ${CP} -g \
+${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d "${TESTCLASSES}" ${CP} -g \
                          "${TESTSRC}"/"${TARGETCLASS}".java
 #
 #Run the test class, again with the classpath we need:
-${TESTJAVA}/bin/java ${CP} ${TARGETCLASS}
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} ${CP} ${TARGETCLASS}
 status=$?
 echo "test status was: $status"
 if [ $status -eq "0" ];
--- old/test/com/sun/jdi/JITDebug.sh	2014-01-26 11:36:32.320797966 +0800
+++ new/test/com/sun/jdi/JITDebug.sh	2014-01-26 11:36:32.184797967 +0800
@@ -102,10 +102,10 @@
    #Deal with .class files:
    #if running standalone (no test harness of any kind), compile the
    #support files and the test case
-   ${TESTJAVA}/bin/javac -d ${TESTCLASSES} \
+   ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES} \
             -classpath "$TESTJAVA/lib/tools.jar${PATHSEP}${TESTSRC}" \
             TestScaffold.java VMConnection.java TargetListener.java TargetAdapter.java
-   ${TESTJAVA}/bin/javac  -d ${TESTCLASSES} \
+   ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS}  -d ${TESTCLASSES} \
             -classpath "$TESTJAVA/lib/tools.jar${PATHSEP}${TESTSRC}" -g \
             JITDebug.java
 fi
@@ -127,8 +127,8 @@
 echo ""
 #
 echo "Starting test:"
-echo ${TESTJAVA}/bin/java -DHANGINGJAVA_DEB ${RUNFLAGS} ${CP} ${TARGETCLASS}
-eval ${TESTJAVA}/bin/java -DHANGINGJAVA_DEB ${RUNFLAGS} ${CP} ${TARGETCLASS}
+echo ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -DHANGINGJAVA_DEB ${RUNFLAGS} ${CP} ${TARGETCLASS}
+eval ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -DHANGINGJAVA_DEB ${RUNFLAGS} ${CP} ${TARGETCLASS}
 status=$?
 if [ $status -ne "0" ];
 then fail "test failed for class=$TARGETCLASS!"
--- old/test/com/sun/jdi/PrivateTransportTest.sh	2014-01-26 11:36:32.840797959 +0800
+++ new/test/com/sun/jdi/PrivateTransportTest.sh	2014-01-26 11:36:32.700797961 +0800
@@ -74,7 +74,7 @@
    TESTSRC=.
    TESTCLASSES=.
    #Deal with .class files:
-   ${TESTJAVA}/bin/javac -d ${TESTCLASSES} \
+   ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES} \
             -classpath "${TESTCLASSES}" -g \
             ${TARGETCLASS}.java
 fi
@@ -189,8 +189,8 @@
     DEBUGGEEFLAGS="$DEBUGGEEFLAGS -agentlib:jdwp=transport=${private_transport},server=y,suspend=n"
 fi
                
-echo ${TESTJAVA}/bin/java ${DEBUGGEEFLAGS} ${CP} ${TARGETCLASS}
-eval ${TESTJAVA}/bin/java ${DEBUGGEEFLAGS} ${CP} ${TARGETCLASS}
+echo ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} ${DEBUGGEEFLAGS} ${CP} ${TARGETCLASS}
+eval ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} ${DEBUGGEEFLAGS} ${CP} ${TARGETCLASS}
 status=$?
 echo "test status for ${DEBUGGERFLAGS} was: $status"
 if [ $status -ne 0 ] ; then 
--- 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
--- old/test/com/sun/jdi/SuspendNoFlagTest.sh	2014-01-26 11:36:33.896797945 +0800
+++ new/test/com/sun/jdi/SuspendNoFlagTest.sh	2014-01-26 11:36:33.752797947 +0800
@@ -75,7 +75,7 @@
    TESTSRC=.
    TESTCLASSES=.
    #Deal with .class files:
-   ${TESTJAVA}/bin/javac -d ${TESTCLASSES} \
+   ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES} \
             -classpath "${TESTCLASSES}" -g \
             ${TARGETCLASS}.java
 fi
@@ -93,8 +93,8 @@
 DEBUGEEFLAGS="$DEBUGEEFLAGS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n"
 
 java=java
-echo ${TESTJAVA}/bin/$java ${DEBUGEEFLAGS} ${CP} ${TARGETCLASS}
-eval ${TESTJAVA}/bin/$java ${DEBUGEEFLAGS} ${CP} ${TARGETCLASS}
+echo ${TESTJAVA}/bin/$java ${TESTVMOPTS} ${TESTJAVAOPTS} ${DEBUGEEFLAGS} ${CP} ${TARGETCLASS}
+eval ${TESTJAVA}/bin/$java ${TESTVMOPTS} ${TESTJAVAOPTS} ${DEBUGEEFLAGS} ${CP} ${TARGETCLASS}
 status=$?
 echo "test status was: $status"
 if [ $status -eq "0" ] ;
--- old/test/com/sun/jdi/redefine/RedefineSetUp.sh	2014-01-26 11:36:34.424797938 +0800
+++ new/test/com/sun/jdi/redefine/RedefineSetUp.sh	2014-01-26 11:36:34.280797939 +0800
@@ -51,18 +51,18 @@
 echo "TESTCLASSES=${TESTCLASSES}"
 echo "CLASSPATH=${CLASSPATH}"
 
-JAVAC="${TESTJAVA}/bin/javac -g"
+JAVAC="${TESTJAVA}/bin/javac"
 
 cp ${TESTSRC}/Different_RedefineSubTarg.java RedefineSubTarg.java
-${JAVAC} RedefineSubTarg.java
+${JAVAC} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -g RedefineSubTarg.java
 mv RedefineSubTarg.class Different_RedefineSubTarg.class
 rm -f RedefineSubTarg.java
 
 cp ${TESTSRC}/SchemaChange_RedefineSubTarg.java RedefineSubTarg.java
-${JAVAC} RedefineSubTarg.java
+${JAVAC} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -g RedefineSubTarg.java
 mv RedefineSubTarg.class SchemaChange_RedefineSubTarg.class
 rm -f RedefineSubTarg.java
 
 cp ${TESTSRC}/RedefineSubTarg.java RedefineSubTarg.java
-${JAVAC} RedefineSubTarg.java
+${JAVAC} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -g RedefineSubTarg.java
 rm -f RedefineSubTarg.java
--- old/test/com/sun/jdi/redefineMethod/RedefineSetUp.sh	2014-01-26 11:36:34.932797931 +0800
+++ new/test/com/sun/jdi/redefineMethod/RedefineSetUp.sh	2014-01-26 11:36:34.792797933 +0800
@@ -53,10 +53,10 @@
 JAVAC="${TESTJAVA}/bin/javac"
 
 cp ${TESTSRC}/Different_RedefineSubTarg.java RedefineSubTarg.java
-${JAVAC} -g RedefineSubTarg.java
+${JAVAC} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -g RedefineSubTarg.java
 mv RedefineSubTarg.class Different_RedefineSubTarg.class
 rm -f RedefineSubTarg.java
 
 cp ${TESTSRC}/RedefineSubTarg.java RedefineSubTarg.java
-${JAVAC} -g RedefineSubTarg.java
+${JAVAC} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -g RedefineSubTarg.java
 rm -f RedefineSubTarg.java
--- old/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh	2014-01-26 11:36:35.448797924 +0800
+++ new/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh	2014-01-26 11:36:35.304797926 +0800
@@ -46,7 +46,7 @@
 # we use the pid of this shell process to name the heap dump output file.
 DUMPFILE="java_pid$$.hprof"
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES \
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES \
     DumpHeap ${DUMPFILE} || exit 2
 
 # check that heap dump is parsable
--- old/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	2014-01-26 11:36:35.960797917 +0800
+++ new/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh	2014-01-26 11:36:35.820797919 +0800
@@ -59,7 +59,7 @@
 runOne()
 {
    echo "runOne $@"
-   $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@  || exit 3
+   $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES $@  || exit 3
 }
 
 solaris_swap_size()
--- old/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	2014-01-26 11:36:36.472797910 +0800
+++ new/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh	2014-01-26 11:36:36.332797912 +0800
@@ -43,7 +43,7 @@
    echo "runOne $@"
    $COMPILEJAVA/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d $TESTCLASSES \
        $TESTSRC/$@.java || exit 2
-   $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@        || exit 3
+   $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES $@        || exit 3
 }
 
 # Test GetMaxFileDescriptorCount if we are running on Unix
--- old/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	2014-01-26 11:36:36.984797903 +0800
+++ new/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh	2014-01-26 11:36:36.844797905 +0800
@@ -42,7 +42,7 @@
    echo "runOne $@"
    $COMPILEJAVA/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d $TESTCLASSES \
        $TESTSRC/$@.java || exit 2
-   $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@        || exit 3
+   $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES $@        || exit 3
 }
 
 # Test GetOpenFileDescriptorCount if we are running on Unix
--- old/test/com/sun/tools/extcheck/TestExtcheckArgs.sh	2014-01-26 11:36:37.508797896 +0800
+++ new/test/com/sun/tools/extcheck/TestExtcheckArgs.sh	2014-01-26 11:36:37.364797898 +0800
@@ -32,14 +32,14 @@
 
 case "`uname`" in Windows*|CYGWIN* ) PS=';';; *) PS=':';; esac
 
-${TESTJAVA}/bin/javac -d ${TESTCLASSES} -classpath ${TESTJAVA}/lib/tools.jar${PS}${TESTCLASSES} ${TESTSRC}/TestExtcheckArgs.java
+${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES} -classpath ${TESTJAVA}/lib/tools.jar${PS}${TESTCLASSES} ${TESTSRC}/TestExtcheckArgs.java
 rc=$?
 if [ $rc != 0 ]; then
     echo Compilation failure with exit status $rc
     exit $rc
 fi
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTJAVA}/lib/tools.jar${PS}${TESTCLASSES} TestExtcheckArgs
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTJAVA}/lib/tools.jar${PS}${TESTCLASSES} TestExtcheckArgs
 rc=$?
 if [ $rc != 0 ]; then
     echo Execution failure with exit status $rc
--- old/test/demo/zipfs/basic.sh	2014-01-26 11:36:38.028797889 +0800
+++ new/test/demo/zipfs/basic.sh	2014-01-26 11:36:37.880797891 +0800
@@ -53,7 +53,7 @@
 
 go() {
     echo ""
-    ${TESTJAVA}/bin/java ${TESTVMOPTS} $1 $2 $3 2>&1
+    ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} $1 $2 $3 2>&1
     if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 }
 
--- old/test/java/awt/FontClass/CreateFont/DeleteFont.sh	2014-01-26 11:36:38.552797882 +0800
+++ new/test/java/awt/FontClass/CreateFont/DeleteFont.sh	2014-01-26 11:36:38.404797884 +0800
@@ -42,12 +42,12 @@
 echo "TESTSRC=${TESTSRC}"
 echo "TESTCLASSES=${TESTCLASSES}"
 cd ${TESTSRC}
-${TESTJAVA}/bin/javac -d ${TESTCLASSES} DeleteFont.java
+${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES} DeleteFont.java
 
 cd ${TESTCLASSES}
 
 numfiles0=`ls ${TESTCLASSES} | wc -l`
-${TESTJAVA}/bin/java -Djava.io.tmpdir=${TESTCLASSES} DeleteFont
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.io.tmpdir=${TESTCLASSES} DeleteFont
 
 if [ $? -ne 0 ]
     then
--- old/test/java/awt/JAWT/JAWT.sh	2014-01-26 11:36:39.084797875 +0800
+++ new/test/java/awt/JAWT/JAWT.sh	2014-01-26 11:36:38.936797877 +0800
@@ -49,7 +49,7 @@
     NULL=/dev/null
     PS=":"
     FS="/"
-    ${TESTJAVA}${FS}bin${FS}java -version 2>&1 | grep '64-Bit' > $NULL
+    ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -version 2>&1 | grep '64-Bit' > $NULL
     if [ $? -eq '0' ]
     then
         ARCH="amd64"
@@ -85,7 +85,7 @@
     MAKEFILE="Makefile.win"
     CC="cl"
 	MAKE="nmake"
-	${TESTJAVA}${FS}bin${FS}java -d64 -version 2>&1 | grep '64-Bit' > $NULL
+	${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -d64 -version 2>&1 | grep '64-Bit' > $NULL
     if [ "$?" -eq '0' ]
     then
         ARCH="amd64"
@@ -100,7 +100,7 @@
     FS="/"
     MAKEFILE="Makefile.cygwin"
     CC="gcc"
-	${TESTJAVA}${FS}bin${FS}java -d64 -version 2>&1 | grep '64-Bit' > $NULL
+	${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -d64 -version 2>&1 | grep '64-Bit' > $NULL
     if [ "$?" -eq '0' ]
     then
         ARCH="amd64"
@@ -129,7 +129,7 @@
 esac
 
 echo "OS-ARCH is" ${SYST}-${ARCH}
-${TESTJAVA}${FS}jre${FS}bin${FS}java -fullversion 2>&1
+${TESTJAVA}${FS}jre${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -fullversion 2>&1
 
 which ${MAKE} >${NULL} 2>&1
 if [ "$?" -ne '0' ]
@@ -162,10 +162,10 @@
 
 export CC SYST ARCH LD_LIBRARY_PATH
 
-${JAVAC} -d . ${TESTSRC}${FS}MyCanvas.java
+${JAVAC} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ${TESTSRC}${FS}MyCanvas.java
 ${JAVAH} -jni -classpath . -d . MyCanvas
 ${MAKE} -f ${MAKEFILE}
-${JAVA} -classpath . MyCanvas
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath . MyCanvas
 
 exit $?
 
--- old/test/java/awt/PrintJob/Text/stringwidth.sh	2014-01-26 11:36:39.612797868 +0800
+++ new/test/java/awt/PrintJob/Text/stringwidth.sh	2014-01-26 11:36:39.468797870 +0800
@@ -58,7 +58,7 @@
    JAVA_HOME=$TESTJAVA
 fi
 
-    $JAVA_HOME/bin/java -cp "${CP}" StringWidth
+    $JAVA_HOME/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp "${CP}" StringWidth
     checkstatus
 
 exit 0
--- old/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh	2014-01-26 11:36:40.132797861 +0800
+++ new/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh	2014-01-26 11:36:39.992797863 +0800
@@ -143,7 +143,7 @@
    if [ -a *.java ] ;
       then echo "Reminder, this test should be in its own directory with all"
       echo "supporting files it needs in the directory with it."
-      ${TESTJAVA}/bin/javac ./*.java ;
+      ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} ./*.java ;
    fi
    # else in harness so copy all the class files from where jtreg put them
    # over to the scratch directory this test is running in.
@@ -167,7 +167,7 @@
 # pass, you should be able to cut and paste it into here and it will
 # run with the test harness.
 
-${TESTJAVA}/bin/java ShowExitTest
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} ShowExitTest
 
 ###############  END YOUR TEST CODE !!!!! ############
 #Be sure the last command executed above this line returns 0 for success,
--- old/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh	2014-01-26 11:36:40.664797854 +0800
+++ new/test/java/awt/Toolkit/BadDisplayTest/BadDisplayTest.sh	2014-01-26 11:36:40.512797856 +0800
@@ -19,7 +19,7 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 
-${TESTJAVA}/bin/javac -cp ${TESTSRC} -d . ${TESTSRC}/BadDisplayTest.java
+${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -cp ${TESTSRC} -d . ${TESTSRC}/BadDisplayTest.java
 
 
 DISPLAY=
@@ -28,10 +28,10 @@
 OS=`uname -s`
 case "$OS" in
   SunOS )
-    ${TESTJAVA}/bin/java BadDisplayTest
+    ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} BadDisplayTest
     ;;
   Linux )
-    ${TESTJAVA}/bin/java BadDisplayTest
+    ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} BadDisplayTest
      ;;
   * )
     echo "Unsupported System: ${OS}"
--- old/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh	2014-01-26 11:36:41.180797847 +0800
+++ new/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh	2014-01-26 11:36:41.040797849 +0800
@@ -146,13 +146,13 @@
 
 case "$OS" in
   Windows* | CYGWIN* )
-    ${TESTJAVA}/bin/java -Djava.awt.headless=true \
+    ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.awt.headless=true \
                          TestWrapped sun.awt.windows.WToolkit
     status=$?
     if [ ! $status -eq "0" ]; then
       fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.awt.windows.WToolkit";
     fi
-    ${TESTJAVA}/bin/java -Djava.awt.headless=true \
+    ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.awt.headless=true \
                          -Dawt.toolkit=sun.awt.windows.WToolkit \
                          TestWrapped sun.awt.windows.WToolkit
     status=$?
@@ -162,14 +162,14 @@
     ;;
 
   SunOS | Linux )
-    ${TESTJAVA}/bin/java -Djava.awt.headless=true \
+    ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.awt.headless=true \
                          -Dawt.toolkit=sun.awt.X11.XToolkit \
                          TestWrapped sun.awt.X11.XToolkit
     status=$?
     if [ ! $status -eq "0" ]; then
       fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.awt.xawt.XToolkit";
     fi
-    AWT_TOOLKIT=XToolkit ${TESTJAVA}/bin/java -Djava.awt.headless=true \
+    AWT_TOOLKIT=XToolkit ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.awt.headless=true \
                                               TestWrapped sun.awt.X11.XToolkit
     status=$?
     if [ ! $status -eq "0" ]; then
@@ -178,13 +178,13 @@
     ;;
 
   Darwin)
-    ${TESTJAVA}/bin/java -Djava.awt.headless=true \
+    ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.awt.headless=true \
                          TestWrapped sun.lwawt.macosx.LWCToolkit
     status=$?
     if [ ! $status -eq "0" ]; then
       fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.lwawt.macosx.LWCToolkit";
     fi
-    ${TESTJAVA}/bin/java -Djava.awt.headless=true \
+    ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.awt.headless=true \
                          -Dawt.toolkit=sun.lwawt.macosx.LWCToolkit \
                          TestWrapped sun.lwawt.macosx.LWCToolkit
     status=$?
--- old/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	2014-01-26 11:36:41.684797841 +0800
+++ new/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh	2014-01-26 11:36:41.548797842 +0800
@@ -189,7 +189,7 @@
    if [ -a *.java ] ;
       then echo "Reminder, this test should be in its own directory with all"
       echo "supporting files it needs in the directory with it."
-      ${TESTJAVA}/bin/javac ./*.java ;
+      ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} ./*.java ;
    fi
    # else in harness so copy all the class files from where jtreg put them
    # over to the scratch directory this test is running in.
--- old/test/java/io/File/GetXSpace.sh	2014-01-26 11:36:42.216797833 +0800
+++ new/test/java/io/File/GetXSpace.sh	2014-01-26 11:36:42.068797835 +0800
@@ -53,7 +53,7 @@
 }
 
 runTest() {
-  ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} GetXSpace $* 
+  ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} GetXSpace $* 
   if [ $? -eq 0 ]
   then echo "Passed"
   else
--- old/test/java/io/File/MacPathTest.sh	2014-01-26 11:36:42.736797826 +0800
+++ new/test/java/io/File/MacPathTest.sh	2014-01-26 11:36:42.592797828 +0800
@@ -36,4 +36,4 @@
   TESTCLASSES=.
 fi
 
-export LC_ALL=en_US.UTF-8 ;${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} MacPathTest
+export LC_ALL=en_US.UTF-8 ;${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} MacPathTest
--- old/test/java/io/File/basic.sh	2014-01-26 11:36:43.248797820 +0800
+++ new/test/java/io/File/basic.sh	2014-01-26 11:36:43.104797822 +0800
@@ -44,7 +44,7 @@
     ;;
 esac
 mkdir x.Basic.dir
-if $TESTJAVA/bin/java ${TESTVMOPTS} $* -classpath "$TESTCLASSES" Basic; then
+if $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} $* -classpath "$TESTCLASSES" Basic; then
   [ -f x.Basic.rw ] && (echo "x.Basic.rw not deleted"; exit 1)
   ([ -d x.Basic.dir ] || [ \! -d x.Basic.dir2 ]) \
     && (echo "x.Basic.dir not renamed"; exit 1)
--- old/test/java/io/FileOutputStream/FileOpen.sh	2014-01-26 11:36:43.760797813 +0800
+++ new/test/java/io/FileOutputStream/FileOpen.sh	2014-01-26 11:36:43.624797815 +0800
@@ -52,20 +52,20 @@
 	    ${TESTSRC}\\FileOpenNeg.java
 
 	echo "Opening Writable Normal File.."
-	${TESTJAVA}/bin/java ${TESTVMOPTS} FileOpenPos ${hfile}
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} FileOpenPos ${hfile}
 
 	echo "Opening Writable Hidden File.."
 	${ATTRIB} +h ${hfile}
-	${TESTJAVA}/bin/java ${TESTVMOPTS} FileOpenNeg ${hfile}
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} FileOpenNeg ${hfile}
 
 	echo "Opening Read-Only Normal File.."
 	${ATTRIB} -h ${hfile}
 	${ATTRIB} +r ${hfile}
-	${TESTJAVA}/bin/java ${TESTVMOPTS} FileOpenNeg ${hfile}
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} FileOpenNeg ${hfile}
 
 	echo "Opening Read-Only Hidden File.." 
 	${ATTRIB} +h ${hfile}
-	${TESTJAVA}/bin/java ${TESTVMOPTS} FileOpenNeg ${hfile}
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} FileOpenNeg ${hfile}
 
         rm -f ${hfile}
 	exit
--- old/test/java/io/Serializable/class/run.sh	2014-01-26 11:36:44.272797806 +0800
+++ new/test/java/io/Serializable/class/run.sh	2014-01-26 11:36:44.128797808 +0800
@@ -49,85 +49,85 @@
 rm -f A.java     
 cp ${TESTSRC}/NonSerialA_1.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -d
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -s A
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -d
 echo
 
 echo Write NonSerial1, Read NonSerial2
 rm -f A.java     
 cp ${TESTSRC}/NonSerialA_1.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -s A
 rm -f A.java     
 cp ${TESTSRC}/NonSerialA_2.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -d
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -d
 echo
 
 echo Write NonSerial1, Read Serial1
 rm -f A.java     
 cp ${TESTSRC}/NonSerialA_1.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java 
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -s A
 rm -f A.java     
 cp ${TESTSRC}/SerialA_1.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -d
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -d
 echo
 
 echo Write Serial1, Read NonSerial1
 rm -f A.java     
 cp ${TESTSRC}/SerialA_1.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java 
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -s A
 rm -f A.java     
 cp ${TESTSRC}/NonSerialA_1.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -doe
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -doe
 echo
 
 echo Write Serial1, Read Serial2
 rm -f A.java     
 cp ${TESTSRC}/SerialA_1.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java 
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -s A
 rm -f A.java     
 cp ${TESTSRC}/SerialA_2.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -d
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -d
 echo
 
 echo Write Serial2, Read Serial1
 rm -f A.java     
 cp ${TESTSRC}/SerialA_2.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java 
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -s A
 rm -f A.java     
 cp ${TESTSRC}/SerialA_1.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -d
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -d
 echo
 
 echo Write Serial1, Read Serial3
 rm -f A.java     
 cp ${TESTSRC}/SerialA_1.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java 
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -s A
 rm -f A.java     
 cp ${TESTSRC}/SerialA_3.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -de
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -de
 echo
 
 echo Write Serial3, Read Serial1
 rm -f A.java     
 cp ${TESTSRC}/SerialA_3.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java 
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -s A
 rm -f A.java     
 cp ${TESTSRC}/SerialA_1.java A.java
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} A.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test -de
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test -de
 echo
 
 echo Passed
--- old/test/java/io/Serializable/evolution/AddedExternField/run.sh	2014-01-26 11:36:44.796797799 +0800
+++ new/test/java/io/Serializable/evolution/AddedExternField/run.sh	2014-01-26 11:36:44.652797801 +0800
@@ -26,8 +26,8 @@
 # @summary  Test reading an evolved class serialization into the original class
 
 rm *.class tmp.ser
-javac WriteAddedField.java
-java ${TESTVMOPTS} WriteAddedField
+javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} WriteAddedField.java
+java ${TESTVMOPTS} ${TESTJAVAOPTS} WriteAddedField
 rm *.class
-javac ReadAddedField.java
-java ${TESTVMOPTS} ReadAddedField
+javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} ReadAddedField.java
+java ${TESTVMOPTS} ${TESTJAVAOPTS} ReadAddedField
--- old/test/java/io/Serializable/evolution/RenamePackage/run.sh	2014-01-26 11:36:45.312797792 +0800
+++ new/test/java/io/Serializable/evolution/RenamePackage/run.sh	2014-01-26 11:36:45.172797794 +0800
@@ -93,13 +93,13 @@
 
 # Run Case 1. Map test.SerialDriver within stream to install.SerialDriver.
 CLASSPATH="${TESTCLASSES}/oclasses${PS}${TESTCLASSES}/share"; export CLASSPATH;
-${JAVA} ${TESTVMOPTS} test.SerialDriver -s
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} test.SerialDriver -s
 CLASSPATH="${TESTCLASSES}/nclasses${PS}${TESTCLASSES}/share"; export CLASSPATH;
-${JAVA} ${TESTVMOPTS} install.SerialDriver -d
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} install.SerialDriver -d
 rm stream.ser
 
 # Run Case 2. Map install.SerialDriver within stream to test.SerialDriver.
 CLASSPATH="${TESTCLASSES}/nclasses${PS}${TESTCLASSES}/share"; export CLASSPATH;
-${JAVA} ${TESTVMOPTS} install.SerialDriver -s
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} install.SerialDriver -s
 CLASSPATH="${TESTCLASSES}/oclasses${PS}${TESTCLASSES}/share"; export CLASSPATH;
-${JAVA} ${TESTVMOPTS} test.SerialDriver -d
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} test.SerialDriver -d
--- old/test/java/io/Serializable/maskSyntheticModifier/run.sh	2014-01-26 11:36:45.836797785 +0800
+++ new/test/java/io/Serializable/maskSyntheticModifier/run.sh	2014-01-26 11:36:45.696797787 +0800
@@ -45,5 +45,5 @@
 set -ex
 cp ${TESTSRC}/Foo.class .
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}/Test.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test
 rm -f *.class
--- old/test/java/io/Serializable/packageAccess/run.sh	2014-01-26 11:36:46.356797778 +0800
+++ new/test/java/io/Serializable/packageAccess/run.sh	2014-01-26 11:36:46.212797780 +0800
@@ -50,5 +50,5 @@
 ${COMPILEJAVA}/bin/jar ${TESTTOOLVMOPTS} cf foo.jar B.class D.class
 rm -f B.class D.class
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test
 rm -f *.class *.jar
--- old/test/java/io/Serializable/resolveClass/consTest/run.sh	2014-01-26 11:36:46.876797771 +0800
+++ new/test/java/io/Serializable/resolveClass/consTest/run.sh	2014-01-26 11:36:46.732797773 +0800
@@ -49,5 +49,5 @@
 rm -f *.class
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -classpath boot.jar -d . \
     ${TESTSRC}/Test.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Xbootclasspath/a:boot.jar Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Xbootclasspath/a:boot.jar Test
 rm -f *.class *.jar
--- old/test/java/io/Serializable/resolveClass/deserializeButton/run.sh	2014-01-26 11:36:47.380797764 +0800
+++ new/test/java/io/Serializable/resolveClass/deserializeButton/run.sh	2014-01-26 11:36:47.244797766 +0800
@@ -50,5 +50,5 @@
 ${COMPILEJAVA}/bin/jar ${TESTTOOLVMOPTS} cf cb.jar *.class
 rm -f *.class
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}/Test.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test
 rm -f *.class *.jar
--- old/test/java/io/Serializable/subclass/run.sh	2014-01-26 11:36:47.896797757 +0800
+++ new/test/java/io/Serializable/subclass/run.sh	2014-01-26 11:36:47.752797759 +0800
@@ -24,7 +24,7 @@
 #
 # @bug 4100915
 mkdir classes
-javac -d classes *.java
-java ${TESTVMOPTS} -classpath classes -Djava.policy=Allow.policy Test 
+javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d classes *.java
+java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath classes -Djava.policy=Allow.policy Test 
 # ENABLE next line when new method for invoking a main with a SecureClassLoader is known
 #java -classpath classes -Djava.policy=NotAllow.policy Test -expectSecurityException
--- old/test/java/io/Serializable/superclassDataLoss/run.sh	2014-01-26 11:36:48.412797751 +0800
+++ new/test/java/io/Serializable/superclassDataLoss/run.sh	2014-01-26 11:36:48.276797752 +0800
@@ -52,5 +52,5 @@
 
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
     ${TESTSRC}/Test.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test
 rm -f *.class *.jar
--- old/test/java/io/Serializable/unnamedPackageSwitch/run.sh	2014-01-26 11:36:48.932797744 +0800
+++ new/test/java/io/Serializable/unnamedPackageSwitch/run.sh	2014-01-26 11:36:48.784797746 +0800
@@ -46,4 +46,4 @@
 
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
     ${TESTSRC}/A.java ${TESTSRC}/Test.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test
--- old/test/java/lang/Class/forName/NonJavaNames.sh	2014-01-26 11:36:49.452797737 +0800
+++ new/test/java/lang/Class/forName/NonJavaNames.sh	2014-01-26 11:36:49.308797739 +0800
@@ -94,7 +94,7 @@
 COPYSEMICOLON="cp ${TESTSRC}/classes/semicolon.class ${TESTCLASSES}/;.class"
 $COPYSEMICOLON
 
-JAVA="$TESTJAVA/bin/java ${TESTVMOPTS} -classpath ${TESTSRC}/classes${SEP}${TESTCLASSES}"
+JAVA="$TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTSRC}/classes${SEP}${TESTCLASSES}"
 
 $JAVA NonJavaNames
 RESULT=$?
--- old/test/java/lang/ClassLoader/Assert.sh	2014-01-26 11:36:49.968797730 +0800
+++ new/test/java/lang/ClassLoader/Assert.sh	2014-01-26 11:36:49.828797732 +0800
@@ -53,7 +53,7 @@
 
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} Assert.java 
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} Assert
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Assert
 
 result=$?
 if [ $result -eq 0 ]
--- old/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	2014-01-26 11:36:50.484797723 +0800
+++ new/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	2014-01-26 11:36:50.344797725 +0800
@@ -102,7 +102,7 @@
 
 # run test
 ${TESTJAVA}${FS}bin${FS}java \
-        ${TESTVMOPTS} \
+        ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -verbose:class -XX:+TraceClassLoading -cp . \
         -Dtest.classes=${TESTCLASSES} \
         Starter cross
--- old/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	2014-01-26 11:36:50.992797716 +0800
+++ new/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh	2014-01-26 11:36:50.848797718 +0800
@@ -98,7 +98,7 @@
 
 # run test
 ${TESTJAVA}${FS}bin${FS}java \
-        ${TESTVMOPTS} \
+        ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -verbose:class -XX:+TraceClassLoading -cp . \
         -Dtest.classes=${TESTCLASSES} \
         Starter one-way
--- old/test/java/lang/ClassLoader/getdotresource.sh	2014-01-26 11:36:51.516797709 +0800
+++ new/test/java/lang/ClassLoader/getdotresource.sh	2014-01-26 11:36:51.372797711 +0800
@@ -33,5 +33,5 @@
 if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi
 
 # now start the test
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetDotResource
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetDotResource
 
--- old/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh	2014-01-26 11:36:52.048797702 +0800
+++ new/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh	2014-01-26 11:36:51.896797704 +0800
@@ -44,7 +44,7 @@
 
 # compile the class ourselves, so this can run as a standalone test
 
-${JAVAC} InheritIO.java
+${JAVAC} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} InheritIO.java
 RES="$?"
 if [ ${RES} != 0 ]; then
     echo 'FAIL: Cannot compile InheritIO.java'
@@ -54,7 +54,7 @@
 
 for TEST_NAME in TestInheritIO TestRedirectInherit
 do
-    ${JAVA} ${TESTVMOPTS} -classpath . \
+    ${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath . \
         'InheritIO$'${TEST_NAME} printf message > stdout.txt 2> stderr.txt
 
     RES="$?"
--- old/test/java/lang/Runtime/exec/setcwd.sh	2014-01-26 11:36:52.568797695 +0800
+++ new/test/java/lang/Runtime/exec/setcwd.sh	2014-01-26 11:36:52.420797697 +0800
@@ -37,5 +37,5 @@
 cp ${TESTCLASSES}/SetCwd.class foo
 
 # now start the test
-${TESTJAVA}/bin/java ${TESTVMOPTS} SetCwd
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} SetCwd
 
--- old/test/java/lang/Runtime/shutdown/ShutdownHooks.sh	2014-01-26 11:36:53.104797688 +0800
+++ new/test/java/lang/Runtime/shutdown/ShutdownHooks.sh	2014-01-26 11:36:52.956797690 +0800
@@ -46,7 +46,7 @@
 # create the file to be deleted on exit
 echo "testing shutdown" > ${TESTCLASSES}/${FILENAME}
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES} ShutdownHooks ${TESTCLASSES} $FILENAME 
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} ShutdownHooks ${TESTCLASSES} $FILENAME 
 if [ $? != 0 ] ; then
   echo "Test Failed"; exit 1
 fi
--- old/test/java/lang/StringCoding/CheckEncodings.sh	2014-01-26 11:36:53.612797681 +0800
+++ new/test/java/lang/StringCoding/CheckEncodings.sh	2014-01-26 11:36:53.472797683 +0800
@@ -49,7 +49,7 @@
   echo "Testing:" ${1}
   set LC_ALL="${1}"; export LC_ALL
   locale
-  ${TESTJAVA}/bin/java ${TESTVMOPTS} -version 2>&1
+  ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -version 2>&1
   expectPass $?
 }
 
--- old/test/java/lang/System/MacEncoding/MacJNUEncoding.sh	2014-01-26 11:36:54.124797674 +0800
+++ new/test/java/lang/System/MacEncoding/MacJNUEncoding.sh	2014-01-26 11:36:53.980797676 +0800
@@ -71,14 +71,14 @@
 echo "Running test for C locale"
 export LANG=C
 export LC_ALL=C
-"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding US-ASCII UTF-8
+"${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding US-ASCII UTF-8
 result1=$?
 
 echo ""
 echo "Running test for en_US.UTF-8 locale"
 export LANG=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
-"${JAVA}" ${TESTVMOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding UTF-8 UTF-8
+"${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTCLASSES}" ExpectedEncoding UTF-8 UTF-8
 result2=$?
 
 echo ""
--- old/test/java/lang/System/finalization/FinExit.sh	2014-01-26 11:36:54.640797667 +0800
+++ new/test/java/lang/System/finalization/FinExit.sh	2014-01-26 11:36:54.500797669 +0800
@@ -26,7 +26,7 @@
 #
 
 # We only want the first character, Windows might add CRLF
-x=`$TESTJAVA/bin/java ${TESTVMOPTS} -cp "$TESTCLASSES" FinExit | cut -c1`
+x=`$TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp "$TESTCLASSES" FinExit | cut -c1`
 echo $x
 if [ "x$x" != "x1" ]; then
   echo On-exit finalizer invoked twice
--- old/test/java/lang/Thread/UncaughtExceptions.sh	2014-01-26 11:36:55.152797661 +0800
+++ new/test/java/lang/Thread/UncaughtExceptions.sh	2014-01-26 11:36:55.012797662 +0800
@@ -123,7 +123,7 @@
 
     Sys "$javac" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} "Seppuku.java"
     CheckCommandResults "$expectedRC" "$expectedOut" "$expectedErr" \
-	"$java" "Seppuku"
+	"$java" ${TESTVMOPTS} ${TESTJAVAOPTS} "Seppuku"
     Cleanup
 }
 
--- old/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	2014-01-26 11:36:55.648797654 +0800
+++ new/test/java/lang/annotation/loaderLeak/LoaderLeak.sh	2014-01-26 11:36:55.512797656 +0800
@@ -73,7 +73,7 @@
 cp ${TESTSRC}${FS}*.java .
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d classes A.java B.java C.java
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} Main.java
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} Main
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} Main
 result=$?
 if [ $result -eq 0 ]
 then
@@ -82,7 +82,7 @@
   echo "Failed 1 of 2"
   exit $result
 fi
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} Main foo
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} Main foo
 result=$?
 if [ $result -eq 0 ]
 then
--- old/test/java/lang/instrument/AppendToBootstrapClassPathSetUp.sh	2014-01-26 11:36:56.156797647 +0800
+++ new/test/java/lang/instrument/AppendToBootstrapClassPathSetUp.sh	2014-01-26 11:36:56.016797649 +0800
@@ -57,7 +57,7 @@
 echo "TESTCLASSES=${TESTCLASSES}"
 echo "CLASSPATH=${CLASSPATH}"
 
-JAVAC="${COMPILEJAVA}/bin/javac -g"
+JAVAC="${COMPILEJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -g"
 
 mkdir -p hidden
 mv ${TESTCLASSES}/ExampleForBootClassPath.class hidden
--- old/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	2014-01-26 11:36:56.680797640 +0800
+++ new/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	2014-01-26 11:36:56.532797642 +0800
@@ -63,7 +63,7 @@
 # java Setup <workdir> <premain-class>
 # - outputs boot class path to boot.dir
 
-"$JAVA" ${TESTVMOPTS} -classpath "${TESTCLASSES}" Setup "${TESTCLASSES}" Agent
+"$JAVA" ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTCLASSES}" Setup "${TESTCLASSES}" Agent
 BOOTDIR=`cat ${TESTCLASSES}/boot.dir`
 
 echo "Created ${BOOTDIR}"
@@ -82,13 +82,13 @@
 
 echo "Running test..."
 
-"${JAVA}" ${TESTVMOPTS} -javaagent:"${TESTCLASSES}"/Agent.jar -classpath "${TESTCLASSES}" DummyMain
+"${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} -javaagent:"${TESTCLASSES}"/Agent.jar -classpath "${TESTCLASSES}" DummyMain
 result=$?
 
 echo "Cleanup..."
 
 "$JAVAC" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" \
     "${TESTSRC}"/Cleanup.java
-"$JAVA" ${TESTTOOLVMOPTS} -classpath "${TESTCLASSES}" Cleanup "${BOOTDIR}"
+"$JAVA" ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTCLASSES}" Cleanup "${BOOTDIR}"
 
 exit $result
--- old/test/java/lang/instrument/ManifestTest.sh	2014-01-26 11:36:57.204797633 +0800
+++ new/test/java/lang/instrument/ManifestTest.sh	2014-01-26 11:36:57.060797635 +0800
@@ -379,7 +379,7 @@
     echo "===== begin test case: $token ====="
     make_a_JAR "$token"
 
-    "${JAVA}" ${TESTVMOPTS} -javaagent:${AGENT}.jar \
+    "${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} -javaagent:${AGENT}.jar \
         -classpath "${TESTCLASSES}" ManifestTestApp > output.log 2>&1
     result=$?
 
--- old/test/java/lang/instrument/ParallelTransformerLoader.sh	2014-01-26 11:36:57.724797626 +0800
+++ new/test/java/lang/instrument/ParallelTransformerLoader.sh	2014-01-26 11:36:57.580797628 +0800
@@ -71,7 +71,7 @@
 # than via Test.jar, then the deadlock will not reproduce.
 rm -f Test*.class
 
-"${JAVA}" ${TESTVMOPTS} -javaagent:ParallelTransformerLoaderAgent.jar=Test.jar \
+"${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} -javaagent:ParallelTransformerLoaderAgent.jar=Test.jar \
     -classpath "${TESTCLASSES}" ParallelTransformerLoaderApp
 result=$?
 echo "result=$result"
--- old/test/java/lang/instrument/RedefineMethodAddInvoke.sh	2014-01-26 11:36:58.260797619 +0800
+++ new/test/java/lang/instrument/RedefineMethodAddInvoke.sh	2014-01-26 11:36:58.108797621 +0800
@@ -70,7 +70,7 @@
 mv RedefineMethodAddInvokeTarget.java RedefineMethodAddInvokeTarget_2.java
 mv RedefineMethodAddInvokeTarget.class RedefineMethodAddInvokeTarget_2.class
 
-"${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodAddInvokeAgent.jar \
+"${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} -javaagent:RedefineMethodAddInvokeAgent.jar \
     -classpath "${TESTCLASSES}" RedefineMethodAddInvokeApp > output.log 2>&1
 cat output.log
 
--- old/test/java/lang/instrument/RedefineMethodInBacktrace.sh	2014-01-26 11:36:58.772797612 +0800
+++ new/test/java/lang/instrument/RedefineMethodInBacktrace.sh	2014-01-26 11:36:58.632797614 +0800
@@ -66,7 +66,7 @@
     RedefineMethodInBacktraceTargetB.java
 "${JAVAC}" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . RedefineMethodInBacktraceTargetB.java
 
-"${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodInBacktraceAgent.jar \
+"${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} -javaagent:RedefineMethodInBacktraceAgent.jar \
     -classpath "${TESTCLASSES}" RedefineMethodInBacktraceApp > output.log 2>&1
 RUN_RESULT=$?
 
--- old/test/java/lang/instrument/RedefineMethodWithAnnotations.sh	2014-01-26 11:36:59.288797605 +0800
+++ new/test/java/lang/instrument/RedefineMethodWithAnnotations.sh	2014-01-26 11:36:59.144797607 +0800
@@ -67,7 +67,7 @@
     RedefineMethodWithAnnotationsTarget.java \
     RedefineMethodWithAnnotationsAnnotations.java
 
-"${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodWithAnnotationsAgent.jar \
+"${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} -javaagent:RedefineMethodWithAnnotationsAgent.jar \
     -XX:+StressLdcRewrite -XX:+IgnoreUnrecognizedVMOptions \
     -cp "${TESTCLASSES}" RedefineMethodWithAnnotationsApp > output.log 2>&1
 cat output.log
--- old/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh	2014-01-26 11:36:59.796797598 +0800
+++ new/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh	2014-01-26 11:36:59.656797600 +0800
@@ -102,7 +102,7 @@
 #
 #    1+2+4+4096+8192+16384+1048576+2097152 == 3174407
 
-"${JAVA}" ${TESTVMOPTS} \
+"${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} \
     -XX:TraceRedefineClasses=3174407 \
     -javaagent:RedefineSubclassWithTwoInterfacesAgent.jar \
     -classpath "${TESTCLASSES}" \
--- old/test/java/lang/instrument/StressGetObjectSizeTest.sh	2014-01-26 11:37:00.312797592 +0800
+++ new/test/java/lang/instrument/StressGetObjectSizeTest.sh	2014-01-26 11:37:00.168797593 +0800
@@ -51,7 +51,7 @@
 
 JAVA="${TESTJAVA}"/bin/java
 
-"${JAVA}" ${TESTVMOPTS} -javaagent:basicAgent.jar \
+"${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} -javaagent:basicAgent.jar \
     -classpath "${TESTCLASSES}" StressGetObjectSizeApp StressGetObjectSizeApp \
     > output.log 2>&1
 cat output.log
--- old/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh	2014-01-26 11:37:00.832797585 +0800
+++ new/test/java/lang/instrument/VerifyLocalVariableTableOnRetransformTest.sh	2014-01-26 11:37:00.688797587 +0800
@@ -55,7 +55,7 @@
 
 JAVA="${TESTJAVA}"/bin/java
 
-"${JAVA}" ${TESTVMOPTS} -Dtest.classes="${TESTCLASSES}" \
+"${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} -Dtest.classes="${TESTCLASSES}" \
     -javaagent:retransformAgent.jar \
     -classpath "${TESTCLASSES}" \
     VerifyLocalVariableTableOnRetransformTest \
--- old/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh	2014-01-26 11:37:01.344797578 +0800
+++ new/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh	2014-01-26 11:37:01.204797580 +0800
@@ -77,4 +77,4 @@
 
 # Finally we run the test
 (cd "${TESTCLASSES}";
-  $JAVA ${TESTVMOPTS} -javaagent:CircularityErrorTest.jar CircularityErrorTest)
+  $JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -javaagent:CircularityErrorTest.jar CircularityErrorTest)
--- old/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh	2014-01-26 11:37:01.880797571 +0800
+++ new/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh	2014-01-26 11:37:01.728797573 +0800
@@ -80,5 +80,5 @@
 
 # Finally we run the test
 (cd "${TESTCLASSES}"; \
-  $JAVA ${TESTVMOPTS} -Xverify:none -XX:+TraceClassUnloading \
+  $JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -Xverify:none -XX:+TraceClassUnloading \
     -javaagent:ClassUnloadTest.jar ClassUnloadTest "${OTHERDIR}" Bar.jar)
--- old/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh	2014-01-26 11:37:02.404797564 +0800
+++ new/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh	2014-01-26 11:37:02.256797566 +0800
@@ -56,7 +56,7 @@
 
 go() {
     echo ''
-    sh -xc "$JAVA ${TESTVMOPTS} -javaagent:Agent.jar -classpath SimpleTests.jar  $1 $2 $3" 2>&1
+    sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -javaagent:Agent.jar -classpath SimpleTests.jar  $1 $2 $3" 2>&1
     if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 }
 
@@ -85,11 +85,11 @@
 cp "${TESTSRC}"/Application.java .
 "${JAVAC}" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . Application.java
 
-sh -xc "$JAVA ${TESTVMOPTS} -classpath . -javaagent:Agent.jar DynamicTest" 2>&1
+sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath . -javaagent:Agent.jar DynamicTest" 2>&1
 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 
 # Repeat test with security manager
-sh -xc "$JAVA ${TESTVMOPTS} -classpath . -javaagent:Agent.jar -Djava.security.manager DynamicTest" 2>&1
+sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath . -javaagent:Agent.jar -Djava.security.manager DynamicTest" 2>&1
 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 
 #
--- old/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh	2014-01-26 11:37:02.916797557 +0800
+++ new/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh	2014-01-26 11:37:02.784797559 +0800
@@ -43,7 +43,7 @@
 runOne()
 { 
    echo "runOne $@"
-   $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 2
+   $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES $@ || exit 2
 }
 
 # Test MemoryManagement with concurrent collector
--- old/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh	2014-01-26 11:37:03.448797550 +0800
+++ new/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh	2014-01-26 11:37:03.300797552 +0800
@@ -43,7 +43,7 @@
 runOne()
 { 
    echo "runOne $@"
-   $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 2
+   $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES $@ || exit 2
 }
 
 # Test MemoryManagement with parallel collector
--- old/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh	2014-01-26 11:37:03.972797543 +0800
+++ new/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh	2014-01-26 11:37:03.824797545 +0800
@@ -43,7 +43,7 @@
 runOne()
 { 
    echo "runOne $@"
-   $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 2
+   $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES $@ || exit 2
 }
 
 # Test MemoryManagement with serial collector
--- old/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh	2014-01-26 11:37:04.484797536 +0800
+++ new/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh	2014-01-26 11:37:04.344797538 +0800
@@ -43,7 +43,7 @@
 runOne()
 { 
    echo "runOne $@"
-   $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 2
+   $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES $@ || exit 2
 }
 
 # Test MemoryTest with default collector
--- old/test/java/lang/management/MemoryMXBean/PendingAllGC.sh	2014-01-26 11:37:05.008797529 +0800
+++ new/test/java/lang/management/MemoryMXBean/PendingAllGC.sh	2014-01-26 11:37:04.864797531 +0800
@@ -43,7 +43,7 @@
 runOne()
 { 
    echo "runOne $@"
-   $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 2
+   $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES $@ || exit 2
 }
 
 # Test Pending with default collector
--- old/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	2014-01-26 11:37:05.532797522 +0800
+++ new/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh	2014-01-26 11:37:05.388797524 +0800
@@ -51,8 +51,8 @@
 
 runOne()
 {
-   echo "$TESTJAVA/bin/java -classpath $TESTCLASSES $@"
-   $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@
+   echo "$TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES $@"
+   $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES $@
 }
 
 # Retry 5 times to be more resilent to system load fluctation.
--- old/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh	2014-01-26 11:37:06.060797515 +0800
+++ new/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh	2014-01-26 11:37:05.912797517 +0800
@@ -43,7 +43,7 @@
 runOne()
 { 
    echo "runOne $@"
-   $TESTJAVA/bin/java $TESTVMOPTS -classpath $TESTCLASSES "$@" || exit 2
+   $TESTJAVA/bin/java $TESTVMOPTS ${TESTJAVAOPTS} -classpath $TESTCLASSES "$@" || exit 2
 }
 
 runOne InputArgument 
--- old/test/java/net/Authenticator/B4933582.sh	2014-01-26 11:37:06.572797508 +0800
+++ new/test/java/net/Authenticator/B4933582.sh	2014-01-26 11:37:06.432797510 +0800
@@ -46,5 +46,5 @@
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
     -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest" ${TESTSRC}${FS}B4933582.java
 rm -f cache.ser auth.save
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}." B4933582 first
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}." B4933582 second
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}." B4933582 first
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}." B4933582 second
--- old/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	2014-01-26 11:37:07.080797501 +0800
+++ new/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh	2014-01-26 11:37:06.936797503 +0800
@@ -49,4 +49,4 @@
     ;;
 esac
 
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} -Xbootclasspath/p:${TESTCLASSES} ADatagramSocket true
+${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Xbootclasspath/p:${TESTCLASSES} ADatagramSocket true
--- old/test/java/net/InetAddress/ptr/lookup.sh	2014-01-26 11:37:07.608797494 +0800
+++ new/test/java/net/InetAddress/ptr/lookup.sh	2014-01-26 11:37:07.464797496 +0800
@@ -43,7 +43,7 @@
 # First check that host resolves to IPv4 address.
 
 echo ''
-ADDR=`$JAVA -Djava.net.preferIPv4Stack=true Lookup -q=A $HOST`
+ADDR=`$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.net.preferIPv4Stack=true Lookup -q=A $HOST`
 if [ $? != 0 ]; then
     echo "$HOST can't be resolved - test skipped."
     exit 0
@@ -53,13 +53,13 @@
 
 # IPv4 reverse lookup
 echo ''
-OUT1=`$JAVA ${TESTVMOPTS} -Djava.net.preferIPv4Stack=true Lookup -q=PTR $ADDR`
+OUT1=`$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.net.preferIPv4Stack=true Lookup -q=PTR $ADDR`
 echo "(IPv4) $ADDR --> $OUT1"
 
 
 # reverse lookup (default)
 echo ''
-OUT2=`$JAVA ${TESTVMOPTS} Lookup -q=PTR $ADDR`
+OUT2=`$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} Lookup -q=PTR $ADDR`
 echo "(default) $ADDR --> $OUT2"
 
 
--- old/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh	2014-01-26 11:37:08.120797487 +0800
+++ new/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh	2014-01-26 11:37:07.984797489 +0800
@@ -45,4 +45,4 @@
     ulimit -n 1024
 fi
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} AcceptCauseFileDescriptorLeak
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} AcceptCauseFileDescriptorLeak
--- old/test/java/net/Socket/OldSocketImpl.sh	2014-01-26 11:37:08.624797480 +0800
+++ new/test/java/net/Socket/OldSocketImpl.sh	2014-01-26 11:37:08.484797482 +0800
@@ -50,7 +50,7 @@
 # with 1.3 and in OldStyleImpl.jar
 
 # run
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTSRC}${FS}OldSocketImpl.jar OldSocketImpl
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTSRC}${FS}OldSocketImpl.jar OldSocketImpl
 result=$?
 if [ "$result" -ne "0" ]; then
     exit 1
--- old/test/java/net/URL/B5086147.sh	2014-01-26 11:37:09.132797474 +0800
+++ new/test/java/net/URL/B5086147.sh	2014-01-26 11:37:08.992797476 +0800
@@ -47,7 +47,7 @@
 failures=0
 
 echo ''
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} B5086147
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} B5086147
 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 
 if [ "$failures" != "0" ]; then
--- old/test/java/net/URLClassLoader/B5077773.sh	2014-01-26 11:37:09.648797467 +0800
+++ new/test/java/net/URLClassLoader/B5077773.sh	2014-01-26 11:37:09.500797469 +0800
@@ -62,5 +62,5 @@
     ${TESTSRC}${FS}B5077773.java
 
 WD=`pwd`
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} B5077773
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} B5077773
 
--- old/test/java/net/URLClassLoader/closetest/build2.sh	2014-01-26 11:37:10.160797460 +0800
+++ new/test/java/net/URLClassLoader/closetest/build2.sh	2014-01-26 11:37:10.020797462 +0800
@@ -51,7 +51,7 @@
 echo "Bye world" > ${TESTCLASSES}/test3/bye.txt
 cp ${TESTSRC}/test1/com/foo/TestClass.java ${TESTCLASSES}/test3
 cd ${TESTCLASSES}/test3
-${JAVAC} -d . TestClass.java
+${JAVAC} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . TestClass.java
 
 ${JAR} cvf foo.jar hello.txt bye.txt com/foo/TestClass.class
 rm -f ../foo.jar
--- old/test/java/net/URLClassLoader/getresourceasstream/test.sh	2014-01-26 11:37:10.680797453 +0800
+++ new/test/java/net/URLClassLoader/getresourceasstream/test.sh	2014-01-26 11:37:10.528797455 +0800
@@ -46,11 +46,11 @@
 ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}/Test.java
 cp ${TESTSRC}/test.jar .
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Test
 checkExit 
 
 # try with security manager
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.security.policy=file:./policy -Djava.security.manager Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.security.policy=file:./policy -Djava.security.manager Test
 checkExit 
 exit 0
--- old/test/java/net/URLClassLoader/sealing/checksealed.sh	2014-01-26 11:37:11.200797446 +0800
+++ new/test/java/net/URLClassLoader/sealing/checksealed.sh	2014-01-26 11:37:11.056797448 +0800
@@ -58,7 +58,7 @@
 
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -classpath "${CLASSPATH}" -d . \
     ${TESTSRC}${FS}CheckSealed.java
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp "${CLASSPATH}" CheckSealed 1
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp "${CLASSPATH}" CheckSealed 1
 if [ $? != 0 ]; then exit 1; fi
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp "${CLASSPATH}" CheckSealed 2
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp "${CLASSPATH}" CheckSealed 2
 if [ $? != 0 ]; then exit 1; fi
--- old/test/java/net/URLConnection/6212146/test.sh	2014-01-26 11:37:11.704797439 +0800
+++ new/test/java/net/URLConnection/6212146/test.sh	2014-01-26 11:37:11.568797441 +0800
@@ -67,7 +67,7 @@
 
 WD=`pwd`
 ulimit -H -n 300
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} Test ${WD}/jars/ test.jar
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} Test ${WD}/jars/ test.jar
 result=$?
 rm -rf jars
 exit $?
--- old/test/java/net/URLConnection/UNCTest.sh	2014-01-26 11:37:12.228797432 +0800
+++ new/test/java/net/URLConnection/UNCTest.sh	2014-01-26 11:37:12.080797434 +0800
@@ -36,7 +36,7 @@
 case "$OS" in
     Windows_95 | Windows_98 | Windows_NT )
 	${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}\\UNCTest.java
-	${TESTJAVA}/bin/java ${TESTVMOPTS} UNCTest ${UNC}
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} UNCTest ${UNC}
 	exit
         ;;
 
--- old/test/java/net/URLPermission/nstest/lookup.sh	2014-01-26 11:37:12.740797425 +0800
+++ new/test/java/net/URLPermission/nstest/lookup.sh	2014-01-26 11:37:12.596797427 +0800
@@ -42,7 +42,7 @@
 esac
 
 
-port=`${TESTJAVA}/bin/java -cp ${TESTCLASSES} LookupTest -getport`
+port=`${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} LookupTest -getport`
 
 cat << POLICY > policy
 grant {
@@ -56,4 +56,4 @@
 };
 POLICY
 
-${TESTJAVA}/bin/java -Djava.security.policy=file:./policy -Dsun.net.spi.nameservice.provider.1=simple,sun -cp ${TESTCLASSES}${PS}${TESTSRC} LookupTest -runtest ${port}
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.security.policy=file:./policy -Dsun.net.spi.nameservice.provider.1=simple,sun -cp ${TESTCLASSES}${PS}${TESTSRC} LookupTest -runtest ${port}
--- old/test/java/nio/Buffer/LimitDirectMemory.sh	2014-01-26 11:37:13.272797418 +0800
+++ new/test/java/nio/Buffer/LimitDirectMemory.sh	2014-01-26 11:37:13.120797420 +0800
@@ -34,7 +34,7 @@
 
 runTest() {
   echo "Testing: $*"
-  ${TESTJAVA}/bin/java ${TESTVMOPTS} $*
+  ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} $*
   if [ $? -eq 0 ]
   then echo "--- passed as expected"
   else
@@ -47,7 +47,7 @@
 launchFail() {
   echo "Testing: -XX:MaxDirectMemorySize=$* -cp ${TESTCLASSES} \
      LimitDirectMemory true DEFAULT DEFAULT+1M"
-  ${TESTJAVA}/bin/java ${TESTVMOPTS} -XX:MaxDirectMemorySize=$* -cp ${TESTCLASSES} \
+  ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -XX:MaxDirectMemorySize=$* -cp ${TESTCLASSES} \
      LimitDirectMemory true DEFAULT DEFAULT+1M > ${TMP1} 2>&1
   cat ${TMP1}
   cat ${TMP1} | grep -s "Unrecognized VM option: \'MaxDirectMemorySize="
--- old/test/java/nio/Buffer/genBasic.sh	2014-01-26 11:37:13.796797411 +0800
+++ new/test/java/nio/Buffer/genBasic.sh	2014-01-26 11:37:13.652797413 +0800
@@ -23,10 +23,10 @@
 # questions.
 #
 
-javac -d . ../../../../make/tools/src/build/tools/spp/Spp.java
+javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ../../../../make/tools/src/build/tools/spp/Spp.java
 
 gen() {
-    java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 <Basic-X.java.template >Basic$2.java
+    java ${TESTVMOPTS} ${TESTJAVAOPTS} build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 <Basic-X.java.template >Basic$2.java
 }
 
 gen byte Byte Byte
--- old/test/java/nio/Buffer/genCopyDirectMemory.sh	2014-01-26 11:37:14.308797404 +0800
+++ new/test/java/nio/Buffer/genCopyDirectMemory.sh	2014-01-26 11:37:14.164797406 +0800
@@ -23,10 +23,10 @@
 # questions.
 #
 
-javac -d . ../../../../make/tools/src/build/tools/spp/Spp.java > Spp.java
+javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ../../../../make/tools/src/build/tools/spp/Spp.java > Spp.java
 
 gen() {
-    java  build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3<CopyDirect-X-Memory.java.template >CopyDirect$2Memory.java
+    java ${TESTVMOPTS} ${TESTJAVAOPTS} build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3<CopyDirect-X-Memory.java.template >CopyDirect$2Memory.java
 }
 
 gen byte Byte Byte
--- old/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh	2014-01-26 11:37:14.832797397 +0800
+++ new/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh	2014-01-26 11:37:14.684797399 +0800
@@ -46,7 +46,7 @@
     -C "${TESTCLASSES}" Attack.class
 
 echo "Running test ..."
-$JAVA ${TESTVMOPTS} \
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} \
       -Xbootclasspath/a:"${TESTCLASSES}/Privileged.jar" \
       -classpath "${TESTCLASSES}" \
       AsExecutor
--- old/test/java/nio/channels/Selector/lots_of_updates.sh	2014-01-26 11:37:15.360797390 +0800
+++ new/test/java/nio/channels/Selector/lots_of_updates.sh	2014-01-26 11:37:15.212797392 +0800
@@ -46,4 +46,4 @@
     ulimit -n 2048
 fi
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} LotsOfUpdates
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} LotsOfUpdates
--- old/test/java/nio/channels/SocketChannel/Open.sh	2014-01-26 11:37:15.892797383 +0800
+++ new/test/java/nio/channels/SocketChannel/Open.sh	2014-01-26 11:37:15.744797385 +0800
@@ -29,7 +29,7 @@
     case "$OS" in
         SunOS )
             ulimit -n 100
-            $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES Open ;;
+            $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES Open ;;
         * )
             echo "unrecognized system: $OS" ;;
     esac
--- old/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh	2014-01-26 11:37:16.396797377 +0800
+++ new/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh	2014-01-26 11:37:16.260797378 +0800
@@ -51,7 +51,7 @@
 
 go() {
     echo ''
-    $JAVA ${TESTVMOPTS} $1 $2 $3 2>&1
+    $JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} $1 $2 $3 2>&1
     if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 }
 
--- old/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	2014-01-26 11:37:16.908797370 +0800
+++ new/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh	2014-01-26 11:37:16.768797372 +0800
@@ -109,7 +109,7 @@
 
 go() {
     echo ''
-    sh -xc "$JAVA $DFLAG $1 $2 $3 $4 $5 $6 $7 $8" 2>&1
+    sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} $DFLAG $1 $2 $3 $4 $5 $6 $7 $8" 2>&1
     if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 }
 
--- old/test/java/nio/charset/Charset/default.sh	2014-01-26 11:37:17.420797363 +0800
+++ new/test/java/nio/charset/Charset/default.sh	2014-01-26 11:37:17.280797365 +0800
@@ -64,7 +64,7 @@
   ecs="$1"; shift
 
   echo -n "$L: "
-  cs="`LC_ALL=$L $JAVA ${TESTVMOPTS} -cp $TESTCLASSES Default`"
+  cs="`LC_ALL=$L $JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -cp $TESTCLASSES Default`"
   if [ $? != 0 ]; then
     exit 1
   elif [ "`tolower $cs`" != "`tolower $ecs`" ]; then
--- old/test/java/nio/charset/coders/CheckSJISMappingProp.sh	2014-01-26 11:37:17.932797356 +0800
+++ new/test/java/nio/charset/coders/CheckSJISMappingProp.sh	2014-01-26 11:37:17.792797358 +0800
@@ -51,19 +51,19 @@
 }
 
 
-JAVA="${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES}"
+JAVA="${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES}"
 runTest() {
   echo "Testing:" ${1}
   LC_ALL="$1" ; export LC_ALL
   locale
   # Firstly, test with property set
   # (shift_jis should map to windows-31J charset) 
-  ${JAVA} -Dsun.nio.cs.map="Windows-31J/Shift_JIS" SJISPropTest MS932
+  ${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -Dsun.nio.cs.map="Windows-31J/Shift_JIS" SJISPropTest MS932
   expectPass $?
 
   # Next, test without property set - "shift_jis" follows IANA conventions
   # and should map to the sun.nio.cs.ext.Shift_JIS charset
-  ${JAVA} SJISPropTest Shift_JIS
+  ${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} SJISPropTest Shift_JIS
   expectPass $?
 }
 
--- old/test/java/nio/charset/spi/basic.sh	2014-01-26 11:37:18.448797349 +0800
+++ new/test/java/nio/charset/spi/basic.sh	2014-01-26 11:37:18.304797351 +0800
@@ -117,7 +117,7 @@
 		     av="$av -Djava.security.manager
 		         -Djava.security.policy==$TESTSRC/charsetProvider.sp";;
     esac
-    if (set -x; $JAVA ${TESTVMOPTS} $av Test $css) 2>&1; then
+    if (set -x; $JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} $av Test $css) 2>&1; then
       continue;
     else
       failures=`expr $failures + 1`
--- old/test/java/nio/file/Files/delete_on_close.sh	2014-01-26 11:37:18.976797342 +0800
+++ new/test/java/nio/file/Files/delete_on_close.sh	2014-01-26 11:37:18.832797344 +0800
@@ -51,7 +51,7 @@
 
 TMPFILE="$$.tmp"
 touch $TMPFILE
-$JAVA ${TESTVMOPTS} DeleteOnClose $TMPFILE 2>&1
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} DeleteOnClose $TMPFILE 2>&1
 if [ $? != 0 ]; then exit 1; fi
 if [ -f $TMPFILE ]; then
     echo "$TMPFILE was not deleted"
--- old/test/java/nio/file/Path/MacPathTest.sh	2014-01-26 11:37:19.496797335 +0800
+++ new/test/java/nio/file/Path/MacPathTest.sh	2014-01-26 11:37:19.344797337 +0800
@@ -36,4 +36,4 @@
   TESTCLASSES=.
 fi
 
-export LC_ALL=en_US.UTF-8; ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} MacPathTest
+export LC_ALL=en_US.UTF-8; ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} MacPathTest
--- old/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh	2014-01-26 11:37:20.008797328 +0800
+++ new/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh	2014-01-26 11:37:19.864797330 +0800
@@ -51,5 +51,5 @@
 mkdir -p ext
 $COMPILEJAVA/bin/jar ${TESTTOOLVMOPTS} cf ext/ext.jar -C $TESTCLASSES ExtLoadedImpl.class -C $TESTCLASSES ExtLoadedImpl_Stub.class -C $TESTCLASSES CheckLoader.class
 
-$TESTJAVA/bin/java ${TESTVMOPTS} -cp classes -Dtest.src=$TESTSRC -Dtest.classes=$TESTCLASSES -Djava.security.policy=$TESTSRC/security.policy -Djava.ext.dirs=ext ExtLoadedImplTest
+$TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp classes -Dtest.src=$TESTSRC -Dtest.classes=$TESTCLASSES -Djava.security.policy=$TESTSRC/security.policy -Djava.ext.dirs=ext ExtLoadedImplTest
 
--- old/test/java/rmi/registry/readTest/readTest.sh	2014-01-26 11:37:20.532797321 +0800
+++ new/test/java/rmi/registry/readTest/readTest.sh	2014-01-26 11:37:20.384797323 +0800
@@ -89,7 +89,7 @@
     ;;
 esac
 # trailing / after code base is important for rmi codebase property.
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp $TEST_CLASSPATH ${ARGS} -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 &
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp $TEST_CLASSPATH ${ARGS} -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 &
 TEST_PID=$!
 #bulk of testcase - let it run for a while
 sleep 5
--- old/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	2014-01-26 11:37:21.052797314 +0800
+++ new/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	2014-01-26 11:37:20.908797316 +0800
@@ -91,7 +91,7 @@
         ${TESTSRC}${FILESEP}provider${FILESEP}HashProvider.java
 
 # run the test
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \
+${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" \
 	-Djava.awt.headless=true \
         ClassLoaderDeadlock
--- old/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	2014-01-26 11:37:21.556797308 +0800
+++ new/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh	2014-01-26 11:37:21.420797309 +0800
@@ -62,5 +62,5 @@
 
 JAVA="${TESTJAVA}${FILESEP}bin${FILESEP}java"
 
-${JAVA} ${TESTVMOPTS} -cp "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" Deadlock
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" Deadlock
 
--- old/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	2014-01-26 11:37:22.096797300 +0800
+++ new/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh	2014-01-26 11:37:21.940797302 +0800
@@ -104,8 +104,8 @@
 rm Deadlock2*.class
 
 # create serialized object and run the test
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} CreateSerialized
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} -Djava.ext.dirs=${TESTCLASSES}${FILESEP}testlib Deadlock2
+${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} CreateSerialized
+${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.ext.dirs=${TESTCLASSES}${FILESEP}testlib Deadlock2
 STATUS=$?
 
 # clean up
--- old/test/java/security/Security/signedfirst/Dyn.sh	2014-01-26 11:37:22.624797293 +0800
+++ new/test/java/security/Security/signedfirst/Dyn.sh	2014-01-26 11:37:22.476797295 +0800
@@ -87,7 +87,7 @@
         ${TESTSRC}${FILESEP}DynSignedProvFirst.java
 
 # run the test
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \
+${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \
         DynSignedProvFirst
 
--- old/test/java/security/Security/signedfirst/Static.sh	2014-01-26 11:37:23.136797286 +0800
+++ new/test/java/security/Security/signedfirst/Static.sh	2014-01-26 11:37:22.992797288 +0800
@@ -88,7 +88,7 @@
 
 # run the test
 cd ${TESTSRC}${FILESEP}
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \
+${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \
         -Djava.security.properties=file:${TESTSRC}${FILESEP}Static.props \
         StaticSignedProvFirst
--- old/test/java/security/cert/CertificateFactory/slowstream.sh	2014-01-26 11:37:23.664797279 +0800
+++ new/test/java/security/cert/CertificateFactory/slowstream.sh	2014-01-26 11:37:23.520797281 +0800
@@ -50,5 +50,5 @@
 
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
         ${TESTSRC}${FS}SlowStream.java
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Dtest.src=${TESTSRC} SlowStreamWriter | \
-        ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} SlowStreamReader
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Dtest.src=${TESTSRC} SlowStreamWriter | \
+        ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} SlowStreamReader
--- old/test/java/util/Calendar/GenericTimeZoneNamesTest.sh	2014-01-26 11:37:24.168797273 +0800
+++ new/test/java/util/Calendar/GenericTimeZoneNamesTest.sh	2014-01-26 11:37:24.024797275 +0800
@@ -32,12 +32,12 @@
 
 STATUS=0
 echo "Locale providers: default"
-if ! ${TESTJAVA}/bin/java -esa ${TESTVMOPTS} -cp "${TESTCLASSES}" GenericTimeZoneNamesTest en-US; then
+if ! ${TESTJAVA}/bin/java -esa ${TESTVMOPTS} ${TESTJAVAOPTS} -cp "${TESTCLASSES}" GenericTimeZoneNamesTest en-US; then
     STATUS=1
 fi
 
 echo "Locale providers: CLDR"
-if ! ${TESTJAVA}/bin/java -esa ${TESTVMOPTS} -cp "${TESTCLASSES}" -Djava.locale.providers=CLDR GenericTimeZoneNamesTest en-US; then
+if ! ${TESTJAVA}/bin/java -esa ${TESTVMOPTS} ${TESTJAVAOPTS} -cp "${TESTCLASSES}" -Djava.locale.providers=CLDR GenericTimeZoneNamesTest en-US; then
    STATUS=1
 fi
 exit ${STATUS}
--- old/test/java/util/Calendar/NarrowNamesTest.sh	2014-01-26 11:37:24.672797266 +0800
+++ new/test/java/util/Calendar/NarrowNamesTest.sh	2014-01-26 11:37:24.524797268 +0800
@@ -34,7 +34,7 @@
 for P in "JRE,SPI" "CLDR"
 do
     echo "Locale providers: $P"
-    if ! ${TESTJAVA}/bin/java -esa ${TESTVMOPTS} -cp "${TESTCLASSES}" -Djava.locale.providers="${P}" NarrowNamesTest; then
+    if ! ${TESTJAVA}/bin/java -esa ${TESTVMOPTS} ${TESTJAVAOPTS} -cp "${TESTCLASSES}" -Djava.locale.providers="${P}" NarrowNamesTest; then
         STATUS=1
     fi
 done
--- old/test/java/util/Currency/PropertiesTest.sh	2014-01-26 11:37:25.196797259 +0800
+++ new/test/java/util/Currency/PropertiesTest.sh	2014-01-26 11:37:25.048797261 +0800
@@ -75,7 +75,7 @@
 
 run() {
     echo ''
-    sh -xc "${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} $*" 2>&1
+    sh -xc "${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} $*" 2>&1
     if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 }
 
@@ -121,7 +121,7 @@
 
 # run
 echo ''
-sh -xc "${WRITABLEJDK}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} PropertiesTest -d dump3"
+sh -xc "${WRITABLEJDK}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} PropertiesTest -d dump3"
 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 
 # Cleanup
--- old/test/java/util/Formatter/Basic.sh	2014-01-26 11:37:25.720797252 +0800
+++ new/test/java/util/Formatter/Basic.sh	2014-01-26 11:37:25.568797254 +0800
@@ -39,7 +39,7 @@
   echo "Testing:" ${1}
   TZ="${1}"; export TZ
   echo "  " $TZ
-  ${TESTJAVA}/bin/java ${TESTVMOPTS} Basic
+  ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} Basic
   expectPass $?
 }
 
--- old/test/java/util/Formatter/genBasic.sh	2014-01-26 11:37:26.248797245 +0800
+++ new/test/java/util/Formatter/genBasic.sh	2014-01-26 11:37:26.100797247 +0800
@@ -23,14 +23,14 @@
 # questions.
 #
 
-javac -d . ../../../../make/tools/src/build/tools/spp/Spp.java
+javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ../../../../make/tools/src/build/tools/spp/Spp.java
 
 gen() {
 #  if [ $3 = "true" ]
 #  then $SPP -K$1 -Dtype=$1 -DType=$2 -Kprim<Basic-X.java.template >Basic$2.java
 #  else $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 <Basic-X.java.template >Basic$2.java
 #  fi
-    java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 <Basic-X.java.template >Basic$2.java
+    java ${TESTVMOPTS} ${TESTJAVAOPTS} build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 <Basic-X.java.template >Basic$2.java
 }
 
 gen boolean Boolean       prim  ""  ""   ""
--- old/test/java/util/Locale/LocaleCategory.sh	2014-01-26 11:37:26.764797238 +0800
+++ new/test/java/util/Locale/LocaleCategory.sh	2014-01-26 11:37:26.620797240 +0800
@@ -69,7 +69,7 @@
 # test user.xxx.display user.xxx.format properties
 
 # run
-RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Duser.language.display=ja -Duser.language.format=zh LocaleCategory"
+RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} -Duser.language.display=ja -Duser.language.format=zh LocaleCategory"
 
 echo ${RUNCMD}
 ${RUNCMD}
@@ -85,7 +85,7 @@
 # test user.xxx properties overriding user.xxx.display/format
 
 # run
-RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Duser.language=en -Duser.language.display=ja -Duser.language.format=zh LocaleCategory"
+RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} -Duser.language=en -Duser.language.display=ja -Duser.language.format=zh LocaleCategory"
 
 echo ${RUNCMD}
 ${RUNCMD}
--- old/test/java/util/Locale/LocaleProviders.sh	2014-01-26 11:37:27.280797231 +0800
+++ new/test/java/util/Locale/LocaleProviders.sh	2014-01-26 11:37:27.132797233 +0800
@@ -124,12 +124,12 @@
 ${COMPILEJAVA}${FS}bin${FS}jar ${TESTTOOLVMOPTS} cvf ${SPIDIR}${FS}tznp.jar -C ${SPIDIR}${FS}dest .
 
 # get the platform default locales
-PLATDEF=`${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} LocaleProviders getPlatformLocale display`
+PLATDEF=`${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} LocaleProviders getPlatformLocale display`
 DEFLANG=`echo ${PLATDEF} | sed -e "s/,.*//"`
 DEFCTRY=`echo ${PLATDEF} | sed -e "s/.*,//"`
 echo "DEFLANG=${DEFLANG}"
 echo "DEFCTRY=${DEFCTRY}"
-PLATDEF=`${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} LocaleProviders getPlatformLocale format`
+PLATDEF=`${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} LocaleProviders getPlatformLocale format`
 DEFFMTLANG=`echo ${PLATDEF} | sed -e "s/,.*//"`
 DEFFMTCTRY=`echo ${PLATDEF} | sed -e "s/.*,//"`
 echo "DEFFMTLANG=${DEFFMTLANG}"
@@ -137,7 +137,7 @@
 
 runTest()
 {
-    RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Djava.locale.providers=$PREFLIST LocaleProviders $METHODNAME $PARAM1 $PARAM2 $PARAM3"
+    RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} -Djava.locale.providers=$PREFLIST LocaleProviders $METHODNAME $PARAM1 $PARAM2 $PARAM3"
     echo ${RUNCMD}
     ${RUNCMD}
     result=$?
--- old/test/java/util/PluggableLocale/ExecTest.sh	2014-01-26 11:37:27.808797224 +0800
+++ new/test/java/util/PluggableLocale/ExecTest.sh	2014-01-26 11:37:27.664797226 +0800
@@ -124,9 +124,9 @@
 # run
 if [ "$3" = "true" ]
 then
-  RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Djava.ext.dirs=${EXTDIRS} $2 "
+  RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.ext.dirs=${EXTDIRS} $2 "
 else
-  RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${CLASSPATHARG} $2 "
+  RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${CLASSPATHARG} $2 "
 fi
 
 echo ${RUNCMD}
--- old/test/java/util/ResourceBundle/Bug6299235Test.sh	2014-01-26 11:37:28.324797217 +0800
+++ new/test/java/util/ResourceBundle/Bug6299235Test.sh	2014-01-26 11:37:28.176797219 +0800
@@ -75,7 +75,7 @@
 
 cd ${TESTSRC}
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} -Djava.ext.dirs=${NEW_EXT_DIR} Bug6299235Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} -Djava.ext.dirs=${NEW_EXT_DIR} Bug6299235Test
 
 if [ $? -ne 0 ]
     then
--- old/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh	2014-01-26 11:37:28.852797210 +0800
+++ new/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh	2014-01-26 11:37:28.704797212 +0800
@@ -50,7 +50,7 @@
 : ${TESTCLASS:=.}
 : ${TESTSRC:=.}
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -esa -cp ${TESTCLASS}${DEL}${TESTSRC} MissingResourceCauseTest
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -esa -cp ${TESTCLASS}${DEL}${TESTSRC} MissingResourceCauseTest
 STATUS=$?
 chmod 666 $UNREADABLE
 rm -f $UNREADABLE
--- old/test/java/util/ServiceLoader/basic.sh	2014-01-26 11:37:29.376797203 +0800
+++ new/test/java/util/ServiceLoader/basic.sh	2014-01-26 11:37:29.228797205 +0800
@@ -95,7 +95,7 @@
   cp="$1"; shift
   if [ -z "$cp" ]; then cp="$TESTCLASSES"; else cp="$TESTCLASSES$SEP$cp"; fi
   vmargs="$1"; shift
-  sh -xc "'$JAVA' ${TESTVMOPTS} -cp $cp $vmargs $T $*" 2>&1
+  sh -xc "'$JAVA' ${TESTVMOPTS} ${TESTJAVAOPTS} -cp $cp $vmargs $T $*" 2>&1
   if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 }
 
--- old/test/java/util/TimeZone/OldIDMappingTest.sh	2014-01-26 11:37:29.892797196 +0800
+++ new/test/java/util/TimeZone/OldIDMappingTest.sh	2014-01-26 11:37:29.748797198 +0800
@@ -38,7 +38,7 @@
     if [ x"$I" != x ]; then
 	D="-Dsun.timezone.ids.oldmapping=${I}"
     fi
-    if ! ${JAVA} ${D} ${TESTVMOPTS} -cp ${TESTCLASSES} OldIDMappingTest -new; then
+    if ! ${JAVA} ${D} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} OldIDMappingTest -new; then
 	STATUS=1
     fi
 done
@@ -49,7 +49,7 @@
     if [ "x$I" != x ]; then
 	D="-Dsun.timezone.ids.oldmapping=${I}"
     fi
-    if ! ${JAVA} ${D} ${TESTVMOPTS} -cp ${TESTCLASSES} OldIDMappingTest -old; then
+    if ! ${JAVA} ${D} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} OldIDMappingTest -old; then
 	STATUS=1
     fi
 done
--- old/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh	2014-01-26 11:37:30.412797189 +0800
+++ new/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh	2014-01-26 11:37:30.264797191 +0800
@@ -58,6 +58,6 @@
 # run it with the security manager on, plus accesscontroller debugging
 # will go into infinite recursion trying to get enough permissions for
 # printing Date of failing certificate unless fix is applied.
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.security.manager \
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.security.manager \
   -Djava.security.debug=access,failure,policy \
   -cp ${TESTCLASSES}/timezonedatetest.jar TimeZoneDatePermissionCheck
--- old/test/java/util/prefs/CheckUserPrefsStorage.sh	2014-01-26 11:37:30.968797182 +0800
+++ new/test/java/util/prefs/CheckUserPrefsStorage.sh	2014-01-26 11:37:30.828797184 +0800
@@ -50,14 +50,14 @@
 esac
 
 # run CheckUserPrefFirst - creates and stores a user pref
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} -Djava.util.prefs.userRoot=. CheckUserPrefFirst
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} -Djava.util.prefs.userRoot=. CheckUserPrefFirst
 result=$?
 if [ "$result" -ne "0" ]; then
     exit 1
 fi
 
 # run CheckUserPrefLater - Looks for the stored pref
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} -Djava.util.prefs.userRoot=. CheckUserPrefLater
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} -Djava.util.prefs.userRoot=. CheckUserPrefLater
 result=$?
 if [ "$result" -ne "0" ]; then
     exit 1
--- old/test/java/util/prefs/PrefsSpi.sh	2014-01-26 11:37:31.484797175 +0800
+++ new/test/java/util/prefs/PrefsSpi.sh	2014-01-26 11:37:31.328797177 +0800
@@ -90,17 +90,17 @@
 
 case "`uname`" in Windows*|CYGWIN* ) CPS=';';; *) CPS=':';; esac
 
-Sys "$java" ${TESTVMOPTS} "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
+Sys "$java" ${TESTVMOPTS} ${TESTJAVAOPTS} "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
     -Djava.util.prefs.PreferencesFactory=StubPreferencesFactory \
     -Djava.util.prefs.userRoot=. \
     PrefsSpi "StubPreferences"
-Sys "$java" ${TESTVMOPTS} "-cp" "$TESTCLASSES" \
+Sys "$java" ${TESTVMOPTS} ${TESTJAVAOPTS} "-cp" "$TESTCLASSES" \
     -Djava.util.prefs.userRoot=. \
     PrefsSpi "java.util.prefs.*"
-Sys "$java" ${TESTVMOPTS} "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
+Sys "$java" ${TESTVMOPTS} ${TESTJAVAOPTS} "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
     -Djava.util.prefs.userRoot=. \
     PrefsSpi "StubPreferences"
-Sys "$java" ${TESTVMOPTS} "-cp" "$TESTCLASSES" "-Djava.ext.dirs=extDir" \
+Sys "$java" ${TESTVMOPTS} ${TESTJAVAOPTS} "-cp" "$TESTCLASSES" "-Djava.ext.dirs=extDir" \
     -Djava.util.prefs.userRoot=. \
     PrefsSpi "StubPreferences"
 
--- old/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh	2014-01-26 11:37:32.016797168 +0800
+++ new/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh	2014-01-26 11:37:31.872797170 +0800
@@ -21,5 +21,5 @@
 # questions.
 #
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.ext.dirs=${TESTSRC} -cp ${TESTCLASSES} UserDefaultControlTest
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.ext.dirs=${TESTSRC} -cp ${TESTCLASSES} UserDefaultControlTest
 
--- old/test/java/util/zip/3GBZipFiles.sh	2014-01-26 11:37:32.528797161 +0800
+++ new/test/java/util/zip/3GBZipFiles.sh	2014-01-26 11:37:32.388797163 +0800
@@ -82,7 +82,7 @@
     huge-*) filesize_="$hugeSize" ;;
     tiny-*) filesize_="$tinySize" ;;
   esac
-  sys "$JAVA" ${TESTVMOPTS} "-cp" "$TESTCLASSES" "FileBuilder" \
+  sys "$JAVA" ${TESTVMOPTS} ${TESTJAVAOPTS} "-cp" "$TESTCLASSES" "FileBuilder" \
    "$filetype_" "$filename_" "$filesize_"
 }
 
--- old/test/java/util/zip/ZipFile/deletetempjar.sh	2014-01-26 11:37:33.044797154 +0800
+++ new/test/java/util/zip/ZipFile/deletetempjar.sh	2014-01-26 11:37:32.896797156 +0800
@@ -30,7 +30,7 @@
   TESTCLASSES=.
 fi
 
-tmpfile=`$TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES DeleteTempJar`
+tmpfile=`$TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES DeleteTempJar`
 rc=$?
 if [ $rc != 0 ]; then
     echo Unexpected failure with exit status $rc
--- old/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	2014-01-26 11:37:33.564797147 +0800
+++ new/test/javax/crypto/SecretKeyFactory/FailOverTest.sh	2014-01-26 11:37:33.420797149 +0800
@@ -87,7 +87,7 @@
 fi
 
 ${TESTJAVA}${FS}bin${FS}java \
-    ${TESTVMOPTS} \
+    ${TESTVMOPTS} ${TESTJAVAOPTS} \
     -classpath "${TESTSRC}${FS}P1.jar${PS}${TESTSRC}${FS}P2.jar${PS}." \
     FailOverTest
 result=$?
--- old/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh	2014-01-26 11:37:34.088797140 +0800
+++ new/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh	2014-01-26 11:37:33.948797142 +0800
@@ -172,7 +172,7 @@
    if [ -a *.java ] ; 
       then echo "Reminder, this test should be in its own directory with all"
       echo "supporting files it needs in the directory with it."
-      ${TESTJAVA}/bin/javac ./*.java ; 
+      ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} ./*.java ; 
    fi
    # else in harness so copy all the class files from where jtreg put them
    # over to the scratch directory this test is running in. 
@@ -211,7 +211,7 @@
 # split application classes and test plugin classes
 mv ./UserPluginMetadataFormatTest*.class ./test_classes
 
-$TESTJAVA/bin/java MetadataFormatTest test_classes UserPluginMetadataFormatTest
+$TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} MetadataFormatTest test_classes UserPluginMetadataFormatTest
 
 ###############  END YOUR TEST CODE !!!!! ############
 status=$?
--- old/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh	2014-01-26 11:37:34.616797133 +0800
+++ new/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh	2014-01-26 11:37:34.468797135 +0800
@@ -173,7 +173,7 @@
    if [ -a *.java ] ; 
       then echo "Reminder, this test should be in its own directory with all"
       echo "supporting files it needs in the directory with it."
-      ${TESTJAVA}/bin/javac ./*.java ; 
+      ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} ./*.java ; 
    fi
    # else in harness so copy all the class files from where jtreg put them
    # over to the scratch directory this test is running in. 
@@ -212,7 +212,7 @@
 # split application classes and test plugin classes
 mv ./UserPluginMetadataFormatTest*.class ./test_classes
 
-$TESTJAVA/bin/java MetadataFormatThreadTest test_classes UserPluginMetadataFormatTest
+$TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} MetadataFormatThreadTest test_classes UserPluginMetadataFormatTest
 
 ###############  END YOUR TEST CODE !!!!! ############
 status=$?
--- old/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	2014-01-26 11:37:35.156797126 +0800
+++ new/test/javax/imageio/stream/StreamCloserLeak/run_test.sh	2014-01-26 11:37:35.012797128 +0800
@@ -190,14 +190,14 @@
 fi
 
 # Verify that all classoladers are destroyed
-${TESTJAVA}/bin/java -cp Test.jar test.Main
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp Test.jar test.Main
 if [ $? -ne 0 ] ; then
     fail "Test FAILED: some classloaders weren't destroyed."
 fi
 
 
 # Verify that ImageIO shutdown hook works correcly
-${TESTJAVA}/bin/java -cp Test.jar -DforgetSomeStreams=true test.Main
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp Test.jar -DforgetSomeStreams=true test.Main
 if [ $? -ne 0 ] ; then
     fail "Test FAILED: some classloaders weren't destroyed of shutdown hook failed."
 fi
--- old/test/javax/print/PrintSE/PrintSE.sh	2014-01-26 11:37:35.680797119 +0800
+++ new/test/javax/print/PrintSE/PrintSE.sh	2014-01-26 11:37:35.524797121 +0800
@@ -46,6 +46,6 @@
 
 createJavaPolicyFile
 
-${TESTJAVA}/bin/java -Djava.security.manager -Djava.security.policy=${TESTCLASSES}/print.policy -cp ${TESTCLASSES} PrintSE
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.security.manager -Djava.security.policy=${TESTCLASSES}/print.policy -cp ${TESTCLASSES} PrintSE
 
 exit $?
--- old/test/javax/print/applet/AppletPrintLookup.sh	2014-01-26 11:37:36.212797112 +0800
+++ new/test/javax/print/applet/AppletPrintLookup.sh	2014-01-26 11:37:36.060797114 +0800
@@ -59,30 +59,30 @@
 (cd ${TESTSRC} ; ${JAVAC_CMD} -d ${TESTCLASSES} YesNo.java)
 
 mkdir -p ${TESTCLASSES}${SEP}applet0
-(cd ${TESTSRC}${SEP}applet0 ; ${JAVAC_CMD} -d ${TESTCLASSES}${SEP}applet0 Applet0.java)
+(cd ${TESTSRC}${SEP}applet0 ; ${JAVAC_CMD} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES}${SEP}applet0 Applet0.java)
 
 mkdir -p ${TESTCLASSES}${SEP}applet1
-(cd ${TESTSRC}${SEP}applet1 ; ${JAVAC_CMD} -d ${TESTCLASSES}${SEP}applet1 Applet1.java Applet1PrintService.java Applet1PrintServiceLookup.java)
+(cd ${TESTSRC}${SEP}applet1 ; ${JAVAC_CMD} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES}${SEP}applet1 Applet1.java Applet1PrintService.java Applet1PrintServiceLookup.java)
 rm -rf ${TESTCLASSES}${SEP}applet1/META-INF/services
 mkdir -p ${TESTCLASSES}${SEP}applet1/META-INF/services
 cp -p ${TESTSRC}${SEP}applet1/META-INF/services/javax.print.PrintServiceLookup  ${TESTCLASSES}${SEP}applet1/META-INF/services
 (cd ${TESTCLASSES}${SEP}applet1 ; ${TESTJAVA}${SEP}bin${SEP}jar -cf applet1.jar *.class META-INF)
 
 mkdir -p ${TESTCLASSES}${SEP}applet2
-(cd ${TESTSRC}${SEP}applet2 ; ${JAVAC_CMD} -d ${TESTCLASSES}${SEP}applet2 Applet2.java Applet2PrintService.java Applet2PrintServiceLookup.java)
+(cd ${TESTSRC}${SEP}applet2 ; ${JAVAC_CMD} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES}${SEP}applet2 Applet2.java Applet2PrintService.java Applet2PrintServiceLookup.java)
 
 mkdir -p ${TESTCLASSES}${SEP}applet3
-(cd ${TESTSRC}${SEP}applet3 ; ${JAVAC_CMD} -d ${TESTCLASSES}${SEP}applet3 Applet3.java Applet3PrintService.java)
+(cd ${TESTSRC}${SEP}applet3 ; ${JAVAC_CMD} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES}${SEP}applet3 Applet3.java Applet3PrintService.java)
 
 mkdir -p ${TESTCLASSES}${SEP}applet4
-(cd ${TESTSRC}${SEP}applet4 ; ${JAVAC_CMD} -d ${TESTCLASSES}${SEP}applet4 Applet4.java Applet4PrintService.java Applet4PrintServiceLookup.java)
+(cd ${TESTSRC}${SEP}applet4 ; ${JAVAC_CMD} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES}${SEP}applet4 Applet4.java Applet4PrintService.java Applet4PrintServiceLookup.java)
 
 cp ${TESTSRC}${SEP}AppletPrintLookup.html  ${TESTCLASSES}
 
 ${TESTJAVA}${SEP}bin${SEP}appletviewer ${TESTCLASSES}${SEP}AppletPrintLookup.html &
 
 cd  ${TESTCLASSES} 
-${TESTJAVA}${SEP}bin${SEP}java ${TESTVMOPTS} YesNo
+${TESTJAVA}${SEP}bin${SEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} YesNo
  if [ $? -ne 0 ]
     then
       echo "Test fails!"
--- old/test/javax/rmi/ssl/SSLSocketParametersTest.sh	2014-01-26 11:37:36.740797105 +0800
+++ new/test/javax/rmi/ssl/SSLSocketParametersTest.sh	2014-01-26 11:37:36.596797107 +0800
@@ -35,22 +35,22 @@
 echo -------------------------------------------------------------
 
 # case 1: /* default constructor - default config */
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 1 || exit $?
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 1 || exit $?
 
 # case 2: /* non-default constructor - default config */
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 2 || exit $?
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 2 || exit $?
 
 # case 3: /* needClientAuth=true */
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 3 || exit $?
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 3 || exit $?
 
 # case 4: /* server side dummy_ciphersuite */
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 4 || exit $?
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 4 || exit $?
 
 # case 5: /* server side dummy_protocol */
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 5 || exit $?
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 5 || exit $?
 
 # case 6: /* client side dummy_ciphersuite */
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 6 || exit $?
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 6 || exit $?
 
 # case 7: /* client side dummy_protocol */
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 7 || exit $?
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} -Dtest.src=${TESTSRC} SSLSocketParametersTest 7 || exit $?
--- old/test/javax/script/ProviderTest.sh	2014-01-26 11:37:37.336797097 +0800
+++ new/test/javax/script/ProviderTest.sh	2014-01-26 11:37:37.188797099 +0800
@@ -45,6 +45,6 @@
 
 echo "Running test ..."
 
-$JAVA ${TESTVMOPTS} -classpath \
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath \
   "${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \
   ProviderTest
--- old/test/javax/security/auth/Subject/doAs/Test.sh	2014-01-26 11:37:37.852797090 +0800
+++ new/test/javax/security/auth/Subject/doAs/Test.sh	2014-01-26 11:37:37.704797092 +0800
@@ -72,7 +72,7 @@
 cd ${TESTSRC}${FS}
 cd $WD
 echo $WD
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath "${TESTCLASSES}${FS}" \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTCLASSES}${FS}" \
 -Djava.security.manager  \
 -Djava.security.policy=${TESTSRC}${FS}policy \
 Test
--- old/test/lib/security/java.policy/Ext_AllPolicy.sh	2014-01-26 11:37:38.392797083 +0800
+++ new/test/lib/security/java.policy/Ext_AllPolicy.sh	2014-01-26 11:37:38.240797085 +0800
@@ -80,7 +80,7 @@
 ${COMPILEJAVA}${FS}bin${FS}jar ${TESTTOOLVMOPTS} -cvf Ext_AllPolicy.jar Ext_AllPolicy.class
 
 rm Ext_AllPolicy.class
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -Djava.security.manager -Djava.ext.dirs="${TESTCLASSES}" Ext_AllPolicy
 
 exit $?
--- old/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh	2014-01-26 11:37:39.040797074 +0800
+++ new/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh	2014-01-26 11:37:38.780797077 +0800
@@ -34,14 +34,14 @@
 echo "TESTSRC=${TESTSRC}"
 echo "TESTCLASSES=${TESTCLASSES}"
 cd ${TESTSRC}
-${TESTJAVA}/bin/javac -d ${TESTCLASSES} SharedMemoryPixmapsTest.java
+${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES} SharedMemoryPixmapsTest.java
 cd ${TESTCLASSES}
 
 NO_J2D_DGA=true
 J2D_PIXMAPS=shared
 export NO_J2D_DGA J2D_PIXMAPS
 
-${TESTJAVA}/bin/java SharedMemoryPixmapsTest
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} SharedMemoryPixmapsTest
 
 if [ $? -ne 0 ]; then
   echo "Test failed!"
--- old/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh	2014-01-26 11:37:39.692797065 +0800
+++ new/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh	2014-01-26 11:37:39.528797067 +0800
@@ -40,4 +40,4 @@
 JAVA="${TESTJAVA}/bin/java"
 CP=${TESTJAVA}${FS}lib${FS}tools.jar${PS}${TESTCLASSES}${PS}${TESTCLASSES}${FS}..${FS}..${FS}testlibrary
 
-${JAVA} ${TESTVMOPTS} -classpath ${CP} MonitorVmStartTerminate
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${CP} MonitorVmStartTerminate
--- old/test/sun/management/jdp/JdpTest.sh	2014-01-26 11:37:40.224797058 +0800
+++ new/test/sun/management/jdp/JdpTest.sh	2014-01-26 11:37:40.076797060 +0800
@@ -62,7 +62,7 @@
     rm -f ${_testclasses}/*.class
 
     # Compile testcase
-    ${COMPILEJAVA}/bin/javac -XDignore.symbol.file -d ${_testclasses} \
+    ${COMPILEJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -XDignore.symbol.file -d ${_testclasses} \
                                              JdpUnitTest.java \
                                              JdpDoSomething.java \
                                              JdpClient.java
@@ -81,7 +81,7 @@
   testappname=$1
   shift
 
-  ${TESTJAVA}/bin/java -server $* -cp ${_testclasses} ${testappname}  >> ${_logname} 2>&1 &
+  ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -server $* -cp ${_testclasses} ${testappname}  >> ${_logname} 2>&1 &
  _last_pid=$!
 
 # wait until VM is actually starts.
--- old/test/sun/management/jmxremote/RunTest.sh	2014-01-26 11:37:40.800797050 +0800
+++ new/test/sun/management/jmxremote/RunTest.sh	2014-01-26 11:37:40.596797053 +0800
@@ -24,10 +24,10 @@
 # Execute the test. 
 # No need to compile (now done by JTReg tags in calling file)
 #
-echo ${TESTJAVA}/bin/java ${TESTVMOPTS} -Dtest.src=${TESTCLASSES} \
+echo ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Dtest.src=${TESTCLASSES} \
      -classpath ${TESTCLASSES} $* || exit 20 
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Dtest.src=${TESTCLASSES} \
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Dtest.src=${TESTCLASSES} \
      -classpath ${TESTCLASSES} $* || exit 20 
 
 exit 0
--- old/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	2014-01-26 11:37:41.340797043 +0800
+++ new/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh	2014-01-26 11:37:41.192797045 +0800
@@ -104,18 +104,18 @@
 
 go() {
     echo ''
-    sh -xc "$JAVA ${TESTVMOPTS} $1 $2 $3 $4 $5 $6 $7 $8" 2>&1
+    sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} $1 $2 $3 $4 $5 $6 $7 $8" 2>&1
     if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 }
 
 # Test 1 - password file is secure - VM should start
 chmod 700 ${PASSWD}
-sh -xc "$JAVA ${TESTVMOPTS} $mp $pp Null" 2>&1
+sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} $mp $pp Null" 2>&1
 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 
 # Test 2 - password file is not secure - VM should fail to start
 chmod o+rx ${PASSWD}
-sh -xc "$JAVA ${TESTVMOPTS} $mp $pp Null" 2>&1
+sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} $mp $pp Null" 2>&1
 if [ $? = 0 ]; then failures=`expr $failures + 1`; fi
 
 # Reset the file permissions on the generated password file
--- old/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.sh	2014-01-26 11:37:41.884797036 +0800
+++ new/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.sh	2014-01-26 11:37:41.732797038 +0800
@@ -33,7 +33,7 @@
 echo `basename $0 .sh` : Non SSL RMIRegistry - Non SSL Lookup
 echo -------------------------------------------------------------
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES} \
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} \
     -Dtest.src=${TESTSRC} \
     -DtestID=Test1 \
     -Dcom.sun.management.config.file=${TESTSRC}/rmiregistry.properties \
@@ -43,7 +43,7 @@
 echo `basename $0 .sh` : SSL RMIRegistry - Non SSL Lookup
 echo -------------------------------------------------------------
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES} \
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} \
     -Dtest.src=${TESTSRC} \
     -DtestID=Test2 \
     -Dcom.sun.management.config.file=${TESTSRC}/rmiregistryssl.properties \
@@ -53,7 +53,7 @@
 echo `basename $0 .sh` : SSL RMIRegistry - SSL Lookup
 echo -------------------------------------------------------------
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES} \
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES} \
     -Dtest.src=${TESTSRC} \
     -DtestID=Test3 \
     -Djavax.net.ssl.keyStore=${TESTSRC}/ssl/keystore \
--- old/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	2014-01-26 11:37:42.408797029 +0800
+++ new/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh	2014-01-26 11:37:42.256797031 +0800
@@ -101,18 +101,18 @@
 
 go() {
     echo ''
-    sh -xc "$JAVA ${TESTVMOPTS} $1 $2 $3 $4 $5 $6 $7 $8" 2>&1
+    sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} $1 $2 $3 $4 $5 $6 $7 $8" 2>&1
     if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 }
 
 # Test 1 - SSL config file is secure - VM should start
 chmod 700 ${SSL}
-sh -xc "$JAVA ${TESTVMOPTS} $mp $pp Dummy" 2>&1
+sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} $mp $pp Dummy" 2>&1
 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 
 # Test 2 - SSL config file is not secure - VM should fail to start
 chmod o+rx ${SSL}
-sh -xc "$JAVA ${TESTVMOPTS} $mp $pp Dummy" 2>&1
+sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} $mp $pp Dummy" 2>&1
 if [ $? = 0 ]; then failures=`expr $failures + 1`; fi
 
 # Reset the file permissions on the generated SSL config file
--- old/test/sun/misc/Cleaner/exitOnThrow.sh	2014-01-26 11:37:42.992797021 +0800
+++ new/test/sun/misc/Cleaner/exitOnThrow.sh	2014-01-26 11:37:42.840797023 +0800
@@ -39,7 +39,7 @@
   TESTCLASSES=`pwd`
 fi
 
-if $TESTJAVA/bin/java ${TESTVMOPTS} -cp $TESTCLASSES ExitOnThrow; then
+if $TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp $TESTCLASSES ExitOnThrow; then
   echo Failed: VM exited normally
   exit 1
 else
--- old/test/sun/net/InetAddress/nameservice/dns/cname.sh	2014-01-26 11:37:43.520797014 +0800
+++ new/test/sun/net/InetAddress/nameservice/dns/cname.sh	2014-01-26 11:37:43.364797016 +0800
@@ -42,7 +42,7 @@
 export CLASSPATH
 JAVA="${TESTJAVA}/bin/java"
 
-sh -xc "$JAVA ${TESTVMOPTS} CanonicalName $HOST" 2>&1
+sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} CanonicalName $HOST" 2>&1
 if [ $? != 0 ]; then
     echo "DNS not configured or host doesn't resolve to CNAME record"
     exit 0
@@ -52,7 +52,7 @@
 
 go() {
     echo ''
-    sh -xc "$JAVA ${TESTVMOPTS} $1 Lookup $2" 2>&1
+    sh -xc "$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} $1 Lookup $2" 2>&1
     if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 }
 
--- old/test/sun/net/ftp/MarkResetTest.sh	2014-01-26 11:37:44.048797007 +0800
+++ new/test/sun/net/ftp/MarkResetTest.sh	2014-01-26 11:37:43.900797009 +0800
@@ -52,4 +52,4 @@
 # in this directory
 cp ${TESTSRC}${FS}EncDec.doc .
 
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} MarkResetTest
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} MarkResetTest
--- old/test/sun/net/sdp/sanity.sh	2014-01-26 11:37:44.556797000 +0800
+++ new/test/sun/net/sdp/sanity.sh	2014-01-26 11:37:44.400797002 +0800
@@ -57,7 +57,7 @@
 export CLASSPATH
 
 # Probe for IP addresses plumbed to IB interfaces
-$JAVA ${TESTVMOPTS} -Djava.net.preferIPv4Stack=true ProbeIB ${IB_LINKS} > ${IB_ADDRS}
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.net.preferIPv4Stack=true ProbeIB ${IB_LINKS} > ${IB_ADDRS}
 
 # Create sdp.conf
 SDPCONF=sdp.conf
@@ -70,4 +70,4 @@
 done
 
 # Sanity check
-$JAVA ${TESTVMOPTS} -Djava.net.preferIPv4Stack=true -Dcom.sun.sdp.conf=${SDPCONF} -Dcom.sun.sdp.debug Sanity
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.net.preferIPv4Stack=true -Dcom.sun.sdp.conf=${SDPCONF} -Dcom.sun.sdp.debug Sanity
--- old/test/sun/net/www/http/HttpClient/RetryPost.sh	2014-01-26 11:37:45.208796991 +0800
+++ new/test/sun/net/www/http/HttpClient/RetryPost.sh	2014-01-26 11:37:45.064796993 +0800
@@ -50,14 +50,14 @@
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}${FS}RetryPost.java
 
 # run with no option specified. Should retry POST request.
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} RetryPost
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} RetryPost
 result=$?
 if [ "$result" -ne "0" ]; then
     exit 1
 fi
 
 # run with option specified. Should not retry POST request.
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Dsun.net.http.retryPost=false RetryPost noRetry
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Dsun.net.http.retryPost=false RetryPost noRetry
 result=$?
 if [ "$result" -ne "0" ]; then
     exit 1
--- old/test/sun/net/www/protocol/file/DirPermissionDenied.sh	2014-01-26 11:37:45.752796984 +0800
+++ new/test/sun/net/www/protocol/file/DirPermissionDenied.sh	2014-01-26 11:37:45.608796986 +0800
@@ -35,7 +35,7 @@
 mkdir -p ${TESTDIR}
 chmod 333 ${TESTDIR}
 
-$TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES DirPermissionDenied ${TESTDIR}
+$TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES DirPermissionDenied ${TESTDIR}
 result=$?
 
 # Add back read access for user, otherwise not removable on some systems
--- old/test/sun/net/www/protocol/jar/B5105410.sh	2014-01-26 11:37:46.316796977 +0800
+++ new/test/sun/net/www/protocol/jar/B5105410.sh	2014-01-26 11:37:46.176796979 +0800
@@ -51,5 +51,5 @@
 
 cp ${TESTSRC}${FS}foo2.jar .
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}${FS}B5105410.java
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} B5105410
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} B5105410
 
--- old/test/sun/net/www/protocol/jar/getcontenttype.sh	2014-01-26 11:37:46.832796970 +0800
+++ new/test/sun/net/www/protocol/jar/getcontenttype.sh	2014-01-26 11:37:46.684796972 +0800
@@ -33,5 +33,5 @@
 if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi
 
 # now start the test
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetContentType
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetContentType
 
--- old/test/sun/net/www/protocol/jar/jarbug/run.sh	2014-01-26 11:37:47.352796963 +0800
+++ new/test/sun/net/www/protocol/jar/jarbug/run.sh	2014-01-26 11:37:47.196796965 +0800
@@ -71,7 +71,7 @@
 #
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d ${DEST} ${TESTSRC}${FS}src${FS}test${FS}*.java
 cd ${DEST}
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} RunAllTests
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} RunAllTests
 result=$?
 if [ "$result" -ne "0" ]; then
     exit 1
--- old/test/sun/reflect/Reflection/GetCallerClassTest.sh	2014-01-26 11:37:47.884796956 +0800
+++ new/test/sun/reflect/Reflection/GetCallerClassTest.sh	2014-01-26 11:37:47.736796958 +0800
@@ -56,13 +56,13 @@
 mkdir ${BCP}
 
 # Compile GetCallerClass in bootclasspath
-${COMPILEJAVA}/bin/javac ${TESTTOOLVMOPTS} \
+${COMPILEJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} \
      -XDignore.symbol.file \
      -d ${BCP} ${TESTSRC}/GetCallerClass.java  || exit 1
 
-${COMPILEJAVA}/bin/javac ${TESTTOOLVMOPTS} \
+${COMPILEJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} \
      -XDignore.symbol.file -Xbootclasspath/a:${BCP} \
      -d ${TESTCLASSES} ${TESTSRC}/GetCallerClassTest.java  || exit 2
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Xbootclasspath/a:${BCP} \
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Xbootclasspath/a:${BCP} \
      -cp ${TESTCLASSES} GetCallerClassTest || exit 3
--- old/test/sun/rmi/rmic/manifestClassPath/run.sh	2014-01-26 11:37:48.496796948 +0800
+++ new/test/sun/rmi/rmic/manifestClassPath/run.sh	2014-01-26 11:37:48.328796950 +0800
@@ -112,28 +112,28 @@
 }
 EOF
 
-Success "$javac" -classpath "jars/A.jar"       Main.java MainI.java
+Success "$javac" ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -classpath "jars/A.jar"       Main.java MainI.java
 Success "$rmic"  -classpath "jars/A.jar${PS}." Main
-Success "$java" ${TESTVMOPTS} -classpath "jars/A.jar${PS}." Main
+Success "$java" ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "jars/A.jar${PS}." Main
 
 Sys rm -f Main.class MainI.class Main_Stub.class
 
-Success "$javac" -classpath "jars/sub/B.zip"       Main.java MainI.java
+Success "$javac" ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -classpath "jars/sub/B.zip"       Main.java MainI.java
 Success "$rmic"  -classpath "jars/sub/B.zip${PS}." Main
-Success "$java" ${TESTVMOPTS}  -classpath "jars/sub/B.zip${PS}." Main
+Success "$java" ${TESTVMOPTS} ${TESTJAVAOPTS}  -classpath "jars/sub/B.zip${PS}." Main
 
 #Sys rm -f Main.class MainI.class Main_Stub.class
 Sys rm -f Main_Stub.class				# javac -extdirs workaround
 
-#Success "$javac" -extdirs "jars" -classpath None Main.java MainI.java
+#Success "$javac" ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -extdirs "jars" -classpath None Main.java MainI.java
 Success "$rmic"  -extdirs "jars" -classpath .    Main
-Success "$java" ${TESTVMOPTS}  -Djava.ext.dirs="jars" -cp .    Main
+Success "$java" ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.ext.dirs="jars" -cp .    Main
 
 Sys rm -f Main_Stub.class
 
-#Success "$javac" -extdirs "jars/sub" -classpath None Main.java MainI.java
+#Success "$javac" ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -extdirs "jars/sub" -classpath None Main.java MainI.java
 Success "$rmic"  -extdirs "jars/sub" -classpath . Main
-Success "$java" ${TESTVMOPTS}  -Djava.ext.dirs="jars/sub" -cp . Main
+Success "$java" ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.ext.dirs="jars/sub" -cp . Main
 
 Cleanup
 
--- old/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh	2014-01-26 11:37:49.032796940 +0800
+++ new/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh	2014-01-26 11:37:48.884796942 +0800
@@ -41,13 +41,13 @@
 set -ex
 
 ${TESTJAVA}/bin/rmic -classpath ${TESTCLASSES:-.} -d ${TESTCLASSES:-.} PImpl
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES:-.} Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES:-.} Test
 
 ${TESTJAVA}/bin/rmic -classpath ${TESTCLASSES:-.} -d ${TESTCLASSES:-.} -vcompat PImpl
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES:-.} Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES:-.} Test
 
 ${TESTJAVA}/bin/rmic -Xnew -classpath ${TESTCLASSES:-.} -d ${TESTCLASSES:-.} PImpl
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES:-.} Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES:-.} Test
 
 ${TESTJAVA}/bin/rmic -Xnew -classpath ${TESTCLASSES:-.} -d ${TESTCLASSES:-.} -vcompat PImpl
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES:-.} Test
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTCLASSES:-.} Test
--- old/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh	2014-01-26 11:37:49.564796933 +0800
+++ new/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh	2014-01-26 11:37:49.420796935 +0800
@@ -37,7 +37,7 @@
 
 set -x
 
-${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTJAVA}/lib/tools.jar sun.tools.javac.Main -d ${TESTCLASSES:-.} ${TESTSRC:-.}/Foo.java
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath ${TESTJAVA}/lib/tools.jar sun.tools.javac.Main -d ${TESTCLASSES:-.} ${TESTSRC:-.}/Foo.java
 
 result=$?
 if [ $result -eq 0 ]
--- old/test/sun/security/krb5/config/dns.sh	2014-01-26 11:37:50.148796925 +0800
+++ new/test/sun/security/krb5/config/dns.sh	2014-01-26 11:37:49.976796928 +0800
@@ -40,5 +40,5 @@
 
 $COMPILEJAVA/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
    ${TESTSRC}/NamingManager.java ${TESTSRC}/DNS.java
-$TESTJAVA/bin/java -Xbootclasspath/p:. DNS
+$TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -Xbootclasspath/p:. DNS
 
--- old/test/sun/security/krb5/runNameEquals.sh	2014-01-26 11:37:50.692796918 +0800
+++ new/test/sun/security/krb5/runNameEquals.sh	2014-01-26 11:37:50.528796920 +0800
@@ -90,7 +90,7 @@
 
 if [ "${NATIVE}" = "true" ] ; then
     echo "Testing native provider"
-    ${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \
+    ${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -classpath ${TESTCLASSES} \
         -Dsun.security.jgss.native=true \
         ${TEST}
@@ -98,7 +98,7 @@
         echo "Native provider fails"
         EXIT_STATUS=1
         if [ "$OS" = "Linux" -a `arch` = "x86_64" ]; then
-            ${TESTJAVA}${FILESEP}bin${FILESEP}java -XshowSettings:properties -version 2> allprop
+            ${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} -XshowSettings:properties -version 2> allprop
             cat allprop | grep sun.arch.data.model | grep 32
             if [ "$?" = "0" ]; then
                 echo "Running 32-bit JDK on 64-bit Linux. Maybe only 64-bit library is installed."
@@ -110,7 +110,7 @@
 fi
 
 echo "Testing java provider"
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \
+${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -classpath ${TESTCLASSES} \
         -Djava.security.krb5.realm=R \
         -Djava.security.krb5.kdc=127.0.0.1 \
--- old/test/sun/security/krb5/tools/ktcheck.sh	2014-01-26 11:37:51.236796911 +0800
+++ new/test/sun/security/krb5/tools/ktcheck.sh	2014-01-26 11:37:51.084796913 +0800
@@ -54,11 +54,11 @@
 KEYTAB=ktab.tmp
 
 rm $KEYTAB
-${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}KtabCheck.java
+${TESTJAVA}${FS}bin${FS}javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ${TESTSRC}${FS}KtabCheck.java
 
 EXTRA_OPTIONS="-Djava.security.krb5.conf=${TESTSRC}${FS}onlythree.conf"
 KTAB="${TESTJAVA}${FS}bin${FS}ktab -J${EXTRA_OPTIONS} -k $KEYTAB -f"
-CHECK="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${EXTRA_OPTIONS} KtabCheck $KEYTAB"
+CHECK="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} ${EXTRA_OPTIONS} KtabCheck $KEYTAB"
 
 echo ${EXTRA_OPTIONS}
 
--- old/test/sun/security/mscapi/AccessKeyStore.sh	2014-01-26 11:37:51.796796903 +0800
+++ new/test/sun/security/mscapi/AccessKeyStore.sh	2014-01-26 11:37:51.636796906 +0800
@@ -39,16 +39,16 @@
     #
     #  execute test program - rely on it to exit if platform unsupported
 
-	${TESTJAVA}/bin/javac -d . ${TESTSRC}\\AccessKeyStore.java
+	${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ${TESTSRC}\\AccessKeyStore.java
 
 	echo "Using access.policy..."
-	${TESTJAVA}/bin/java ${TESTVMOPTS} \
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} \
 	    -Djava.security.manager \
 	    -Djava.security.policy==${TESTSRC}\\access.policy \
 	    AccessKeyStore
 
 	echo "Using noaccess.policy..."
-	${TESTJAVA}/bin/java ${TESTVMOPTS} \
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} \
 	    -Djava.security.manager \
 	    -Djava.security.policy==${TESTSRC}\\noaccess.policy \
 	    AccessKeyStore -deny
--- old/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh	2014-01-26 11:37:52.332796896 +0800
+++ new/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh	2014-01-26 11:37:52.188796898 +0800
@@ -40,7 +40,7 @@
     #  execute test program - rely on it to exit if platform unsupported
 
 	${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}\\IsSunMSCAPIAvailable.java
-	${TESTJAVA}/bin/java ${TESTVMOPTS} IsSunMSCAPIAvailable
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} IsSunMSCAPIAvailable
 	exit
 	;;
 
--- old/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh	2014-01-26 11:37:52.920796888 +0800
+++ new/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh	2014-01-26 11:37:52.736796891 +0800
@@ -40,18 +40,18 @@
     #
     #  execute test program - rely on it to exit if platform unsupported
 
-	${TESTJAVA}/bin/javac -d . ${TESTSRC}\\KeyStoreCompatibilityMode.java
+	${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ${TESTSRC}\\KeyStoreCompatibilityMode.java
 
     # mode implicitly enabled
-	${TESTJAVA}/bin/java ${TESTVMOPTS} KeyStoreCompatibilityMode
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} KeyStoreCompatibilityMode
 
     # mode explicitly enabled
-	${TESTJAVA}/bin/java ${TESTVMOPTS} \
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} \
 	    -Dsun.security.mscapi.keyStoreCompatibilityMode="true" \
 	    KeyStoreCompatibilityMode
 
     # mode explicitly disabled
-	${TESTJAVA}/bin/java ${TESTVMOPTS} \
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} \
 	    -Dsun.security.mscapi.keyStoreCompatibilityMode="false" \
 	    KeyStoreCompatibilityMode -disable
 
--- old/test/sun/security/mscapi/PublicKeyInterop.sh	2014-01-26 11:37:53.456796881 +0800
+++ new/test/sun/security/mscapi/PublicKeyInterop.sh	2014-01-26 11:37:53.308796883 +0800
@@ -61,8 +61,8 @@
 
         echo
 	echo "Running the test..."
-        ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\PublicKeyInterop.java
-        ${TESTJAVA}/bin/java ${TESTVMOPTS} PublicKeyInterop
+        ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ${TESTSRC}\\PublicKeyInterop.java
+        ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} PublicKeyInterop
 
         rc=$?
 
--- old/test/sun/security/mscapi/RSAEncryptDecrypt.sh	2014-01-26 11:37:53.988796874 +0800
+++ new/test/sun/security/mscapi/RSAEncryptDecrypt.sh	2014-01-26 11:37:53.832796876 +0800
@@ -69,8 +69,8 @@
 	# execute test program - rely on it to exit if platform
 	# unsupported
 
-	${TESTJAVA}/bin/javac -d . ${TESTSRC}\\RSAEncryptDecrypt.java
-	${TESTJAVA}/bin/java ${TESTVMOPTS} RSAEncryptDecrypt
+	${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ${TESTSRC}\\RSAEncryptDecrypt.java
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} RSAEncryptDecrypt
 	exit
 	;;
 
--- old/test/sun/security/mscapi/ShortRSAKey1024.sh	2014-01-26 11:37:54.548796867 +0800
+++ new/test/sun/security/mscapi/ShortRSAKey1024.sh	2014-01-26 11:37:54.400796869 +0800
@@ -87,9 +87,9 @@
 
         echo
         echo "Running the test..."
-        ${TESTJAVA}${FS}bin${FS}javac -d . \
+        ${TESTJAVA}${FS}bin${FS}javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . \
             ${TESTSRC}${FS}ShortRSAKeyWithinTLS.java
-        ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ShortRSAKeyWithinTLS 7106773.$BITS $BITS \
+        ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} ShortRSAKeyWithinTLS 7106773.$BITS $BITS \
             TLSv1.2 TLS_DHE_RSA_WITH_AES_128_CBC_SHA
 
         rc=$?
--- old/test/sun/security/mscapi/SignUsingNONEwithRSA.sh	2014-01-26 11:37:55.060796860 +0800
+++ new/test/sun/security/mscapi/SignUsingNONEwithRSA.sh	2014-01-26 11:37:54.908796862 +0800
@@ -60,8 +60,8 @@
 
         echo
 	echo "Running the test..."
-        ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingNONEwithRSA.java
-        ${TESTJAVA}/bin/java ${TESTVMOPTS} SignUsingNONEwithRSA
+        ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ${TESTSRC}\\SignUsingNONEwithRSA.java
+        ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} SignUsingNONEwithRSA
 
         rc=$?
 
--- old/test/sun/security/mscapi/SignUsingSHA2withRSA.sh	2014-01-26 11:37:55.588796853 +0800
+++ new/test/sun/security/mscapi/SignUsingSHA2withRSA.sh	2014-01-26 11:37:55.436796855 +0800
@@ -60,8 +60,8 @@
 
         echo
 	echo "Running the test..."
-        ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingSHA2withRSA.java
-        ${TESTJAVA}/bin/java ${TESTVMOPTS} SignUsingSHA2withRSA
+        ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ${TESTSRC}\\SignUsingSHA2withRSA.java
+        ${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} SignUsingSHA2withRSA
 
         rc=$?
 
--- old/test/sun/security/pkcs11/KeyStore/Basic.sh	2014-01-26 11:37:56.092796846 +0800
+++ new/test/sun/security/pkcs11/KeyStore/Basic.sh	2014-01-26 11:37:55.944796848 +0800
@@ -176,7 +176,7 @@
 
 # run test
 
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
 	-classpath ${TESTCLASSES}${PS}${TESTSRC}${FS}loader.jar \
 	-DDIR=${TESTSRC}${FS}BasicData \
 	-DCUSTOM_DB_DIR=${TESTCLASSES} \
--- old/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	2014-01-26 11:37:56.612796839 +0800
+++ new/test/sun/security/pkcs11/KeyStore/ClientAuth.sh	2014-01-26 11:37:56.460796841 +0800
@@ -133,7 +133,7 @@
 
 # run test
 echo "Run ClientAuth ..."
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
 	-classpath ${TESTCLASSES}${PS}${TESTSRC}${FS}loader.jar \
 	-DDIR=${TESTSRC}${FS}ClientAuthData${FS} \
 	-DCUSTOM_DB_DIR=${TESTCLASSES} \
@@ -154,7 +154,7 @@
 
 # run test with specified TLS protocol and cipher suite
 echo "Run ClientAuth TLSv1.2 TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
 	-classpath ${TESTCLASSES}${PS}${TESTSRC}${FS}loader.jar \
 	-DDIR=${TESTSRC}${FS}ClientAuthData${FS} \
 	-DCUSTOM_DB_DIR=${TESTCLASSES} \
--- old/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh	2014-01-26 11:37:57.152796832 +0800
+++ new/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh	2014-01-26 11:37:57.004796834 +0800
@@ -141,7 +141,7 @@
 
 # run test
 cd ${TESTSRC}
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
 	-DDIR=${TESTSRC}${FS}BasicData${FS} \
         -classpath \
         ${TESTCLASSES}${PS}${TESTCLASSES}${FS}..${PS}${TESTSRC}${FS}loader.jar \
--- old/test/sun/security/pkcs11/KeyStore/Solaris.sh	2014-01-26 11:37:57.664796825 +0800
+++ new/test/sun/security/pkcs11/KeyStore/Solaris.sh	2014-01-26 11:37:57.520796827 +0800
@@ -147,7 +147,7 @@
 # run test
 
 cd ${TESTSRC}
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
 	-classpath ${TESTCLASSES}${PS}${TESTSRC}${FS}loader.jar \
 	-DDIR=${TESTSRC}${FS}BasicData${FS} \
 	-DCUSTOM_P11_CONFIG=${TESTSRC}${FS}BasicData${FS}p11-solaris.txt \
--- old/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	2014-01-26 11:37:58.172796818 +0800
+++ new/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh	2014-01-26 11:37:58.032796820 +0800
@@ -104,7 +104,7 @@
 
 # run test
 
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -classpath ${TESTCLASSES} \
         -DCUSTOM_P11_CONFIG=${TESTSRC}${FS}ConfigQuotedString-nss.txt \
         -Dtest.src=${TESTSRC} \
--- old/test/sun/security/pkcs11/Provider/Login.sh	2014-01-26 11:37:58.708796811 +0800
+++ new/test/sun/security/pkcs11/Provider/Login.sh	2014-01-26 11:37:58.552796813 +0800
@@ -113,7 +113,7 @@
 
 # run test
 
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
         -classpath ${TESTCLASSES} \
         -DCUSTOM_DB_DIR=${TESTCLASSES} \
         -DCUSTOM_P11_CONFIG=${TESTSRC}${FS}Login-nss.txt \
--- old/test/sun/security/provider/KeyStore/DKSTest.sh	2014-01-26 11:37:59.248796804 +0800
+++ new/test/sun/security/provider/KeyStore/DKSTest.sh	2014-01-26 11:37:59.100796806 +0800
@@ -76,9 +76,9 @@
     ;;
 esac
 
-${COMPILEJAVA}${FS}bin${FS}javac -d .  ${TESTSRC}${FS}DKSTest.java
+${COMPILEJAVA}${FS}bin${FS}javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d .  ${TESTSRC}${FS}DKSTest.java
 
 KEYSTORE_PWD=test12 TRUSTSTORE_PWD=changeit \
-  ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Dtest.src=${TESTSRC} DKSTest
+  ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Dtest.src=${TESTSRC} DKSTest
 
 exit $status
--- old/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	2014-01-26 11:37:59.760796797 +0800
+++ new/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh	2014-01-26 11:37:59.616796799 +0800
@@ -88,7 +88,7 @@
  ${TESTJAVA}${FILESEP}jre${FILESEP}lib${FILESEP}security${FILESEP}tmp_pol
 
 # run the test program
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} -Djava.security.manager \
+${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.security.manager \
  GrantAllPermToExtWhenNoPolicy
 
 # save error status
--- old/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	2014-01-26 11:38:00.288796790 +0800
+++ new/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh	2014-01-26 11:38:00.136796792 +0800
@@ -96,7 +96,7 @@
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d ${TESTCLASSES}${FS}app \
         ${TESTSRC}${FS}GetInstance.java
 
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS}  \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS}  \
 -Xbootclasspath/a:"${TESTCLASSES}${FS}boot" \
 -classpath "${TESTCLASSES}${FS}app" -Djava.security.manager \
 -Djava.security.policy=GetInstance.policy \
@@ -110,7 +110,7 @@
      echo "Failed on first test"
 fi
 
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS}  \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS}  \
 -classpath "${TESTCLASSES}${FS}boot${PS}${TESTCLASSES}${FS}app" \
 -Djava.security.manager \
 -Djava.security.policy=GetInstance.policy \
--- old/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	2014-01-26 11:38:00.812796783 +0800
+++ new/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh	2014-01-26 11:38:00.664796785 +0800
@@ -60,7 +60,7 @@
 echo "${STRING}"
 echo "========="
 
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Djavax.net.debug=all \
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Djavax.net.debug=all \
     -Dtest.src=${TESTSRC} \
     DebugReportsOneExtraByte 2>&1 | \
     grep "${STRING}"
--- old/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	2014-01-26 11:38:01.352796776 +0800
+++ new/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh	2014-01-26 11:38:01.204796778 +0800
@@ -86,7 +86,7 @@
 # This is the only thing we really care about as far as
 # test status goes.
 #
-${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \
+${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} \
     -Dtest.src=${TESTSRC} \
     -classpath "com.jar${PATHSEP}edu.jar" \
     -Djava.security.manager \
--- old/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	2014-01-26 11:38:01.872796769 +0800
+++ new/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh	2014-01-26 11:38:01.728796771 +0800
@@ -54,5 +54,5 @@
     ${TESTSRC}${FS}OriginServer.java \
     ${TESTSRC}${FS}ProxyTunnelServer.java \
     ${TESTSRC}${FS}PostThruProxy.java
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} PostThruProxy ${HOSTNAME} ${TESTSRC}
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} PostThruProxy ${HOSTNAME} ${TESTSRC}
 exit
--- old/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	2014-01-26 11:38:02.396796762 +0800
+++ new/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh	2014-01-26 11:38:02.252796764 +0800
@@ -53,5 +53,5 @@
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}${FS}OriginServer.java \
     ${TESTSRC}${FS}ProxyTunnelServer.java \
     ${TESTSRC}${FS}PostThruProxyWithAuth.java
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} PostThruProxyWithAuth ${HOSTNAME} ${TESTSRC}
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} PostThruProxyWithAuth ${HOSTNAME} ${TESTSRC}
 exit
--- old/test/sun/security/tools/jarsigner/concise_jarsigner.sh	2014-01-26 11:38:02.920796755 +0800
+++ new/test/sun/security/tools/jarsigner/concise_jarsigner.sh	2014-01-26 11:38:02.772796757 +0800
@@ -61,7 +61,7 @@
 echo class A5 {} > A5.java
 echo class A6 {} > A6.java
 
-$JAVAC A1.java A2.java A3.java A4.java A5.java A6.java
+$JAVAC ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} A1.java A2.java A3.java A4.java A5.java A6.java
 YEAR=`date +%Y`
 
 # ==========================================================
--- old/test/sun/security/tools/jarsigner/emptymanifest.sh	2014-01-26 11:38:03.444796748 +0800
+++ new/test/sun/security/tools/jarsigner/emptymanifest.sh	2014-01-26 11:38:03.300796750 +0800
@@ -64,8 +64,8 @@
   }
 }
 EOF
-$JAVAC CrLf.java
-$JAVA ${TESTVMOPTS} CrLf > META-INF${FS}MANIFEST.MF
+$JAVAC ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} CrLf.java
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} CrLf > META-INF${FS}MANIFEST.MF
 zip $JFILE META-INF${FS}MANIFEST.MF A B
 
 $KT -alias a -dname CN=a -keyalg rsa -genkey -validity 300
--- old/test/sun/security/tools/jarsigner/ts.sh	2014-01-26 11:38:03.968796741 +0800
+++ new/test/sun/security/tools/jarsigner/ts.sh	2014-01-26 11:38:03.816796743 +0800
@@ -86,6 +86,6 @@
         $KT -alias ca -gencert -ext eku:critical=cs | \
         $KT -alias tsbad3 -importcert
 
-$JAVAC -d . ${TESTSRC}/TimestampCheck.java
-$JAVA ${TESTVMOPTS} TimestampCheck
+$JAVAC ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}/TimestampCheck.java
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} TimestampCheck
 
--- old/test/sun/security/tools/keytool/autotest.sh	2014-01-26 11:38:04.480796734 +0800
+++ new/test/sun/security/tools/keytool/autotest.sh	2014-01-26 11:38:04.332796736 +0800
@@ -54,7 +54,7 @@
 }
 
 FS="/"
-${TESTJAVA}${FS}bin${FS}java -XshowSettings:properties -version 2> allprop
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -XshowSettings:properties -version 2> allprop
 cat allprop | grep sun.arch.data.model | grep 32
 if [ "$?" != "0" ]; then
   B32=false
@@ -106,7 +106,7 @@
 chmod u+w key3.db
 chmod u+w cert8.db
 
-echo | ${TESTJAVA}${FS}bin${FS}java -Dnss \
+echo | ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Dnss \
    -Dnss.lib=${LIBNAME} \
    KeyToolTest
 status=$?
--- old/test/sun/security/tools/keytool/printssl.sh	2014-01-26 11:38:05.012796727 +0800
+++ new/test/sun/security/tools/keytool/printssl.sh	2014-01-26 11:38:04.864796729 +0800
@@ -56,7 +56,7 @@
 esac
 
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}${FS}PrintSSL.java || exit 10
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Dtest.src=$TESTSRC PrintSSL | ( read PORT; ${TESTJAVA}${FS}bin${FS}keytool -printcert -sslserver localhost:$PORT )
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Dtest.src=$TESTSRC PrintSSL | ( read PORT; ${TESTJAVA}${FS}bin${FS}keytool -printcert -sslserver localhost:$PORT )
 status=$?
 
 rm PrintSSL*.class
--- old/test/sun/security/tools/keytool/standard.sh	2014-01-26 11:38:05.552796720 +0800
+++ new/test/sun/security/tools/keytool/standard.sh	2014-01-26 11:38:05.388796722 +0800
@@ -59,7 +59,7 @@
 
 ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . -XDignore.symbol.file ${TESTSRC}${FS}KeyToolTest.java || exit 10
 
-echo | ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Dfile KeyToolTest
+echo | ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${TESTJAVAOPTS} -Dfile KeyToolTest
 status=$?
 
 rm HumanInputStream*.class
--- old/test/sun/security/validator/certreplace.sh	2014-01-26 11:38:06.068796713 +0800
+++ new/test/sun/security/validator/certreplace.sh	2014-01-26 11:38:05.920796715 +0800
@@ -83,4 +83,4 @@
 # 5. Build and run test
 
 $JAVAC ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}${FS}CertReplace.java
-$JAVA ${TESTVMOPTS} CertReplace certreplace.jks certreplace.certs
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} CertReplace certreplace.jks certreplace.certs
--- old/test/sun/security/validator/samedn.sh	2014-01-26 11:38:06.580796706 +0800
+++ new/test/sun/security/validator/samedn.sh	2014-01-26 11:38:06.432796708 +0800
@@ -79,5 +79,5 @@
 # Check both, one of them might be dropped out of map in old codes.
 
 $JAVAC ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}${FS}CertReplace.java
-$JAVA ${TESTVMOPTS} CertReplace samedn.jks samedn1.certs || exit 1
-$JAVA ${TESTVMOPTS} CertReplace samedn.jks samedn2.certs || exit 2
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} CertReplace samedn.jks samedn1.certs || exit 1
+$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} CertReplace samedn.jks samedn2.certs || exit 2
--- old/test/sun/tools/common/ApplicationSetup.sh	2014-01-26 11:38:07.112796699 +0800
+++ new/test/sun/tools/common/ApplicationSetup.sh	2014-01-26 11:38:06.956796701 +0800
@@ -43,7 +43,7 @@
 {
   appOutput="${TESTCLASSES}/Application.out"
 
-  ${JAVA} -XX:+UsePerfData -classpath "${TESTCLASSPATH:-${TESTCLASSES}}" "$@" > "$appOutput" 2>&1 &
+  ${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -XX:+UsePerfData -classpath "${TESTCLASSPATH:-${TESTCLASSES}}" "$@" > "$appOutput" 2>&1 &
   appJavaPid="$!"
   appOtherPid=
   appPidList="$appJavaPid"
@@ -131,7 +131,7 @@
 #
 stopApplication()
 {
-  $JAVA -XX:+UsePerfData -classpath "${TESTCLASSPATH:-${TESTCLASSES}}" ShutdownSimpleApplication $1
+  $JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} -XX:+UsePerfData -classpath "${TESTCLASSPATH:-${TESTCLASSES}}" ShutdownSimpleApplication $1
 }
 
 
--- old/test/sun/tools/jconsole/ResourceCheckTest.sh	2014-01-26 11:38:07.652796692 +0800
+++ new/test/sun/tools/jconsole/ResourceCheckTest.sh	2014-01-26 11:38:07.496796694 +0800
@@ -98,11 +98,11 @@
 set -vx
 #
 #Compile.  jconsole.jar is required on the classpath.
-${TESTJAVA}/bin/javac -d "${TESTCLASSES}" ${CP} -g \
+${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d "${TESTCLASSES}" ${CP} -g \
                          "${TESTSRC}"/"${TARGETCLASS}".java
 #
 #Run the test class, again with the classpath we need:
-${TESTJAVA}/bin/java ${CP} ${TARGETCLASS}
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} ${CP} ${TARGETCLASS}
 status=$?
 echo "test status was: $status"
 if [ $status -eq "0" ];
--- old/test/sun/tools/jrunscript/jrunscript-DTest.sh	2014-01-26 11:38:08.176796685 +0800
+++ new/test/sun/tools/jrunscript/jrunscript-DTest.sh	2014-01-26 11:38:08.024796687 +0800
@@ -33,7 +33,7 @@
 . ${TESTSRC-.}/common.sh
 
 setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
 if [ $? -eq 2 ]; then
     echo "No js engine found and engine not required; test vacuously passes."
     exit 0
--- old/test/sun/tools/jrunscript/jrunscript-argsTest.sh	2014-01-26 11:38:08.704796677 +0800
+++ new/test/sun/tools/jrunscript/jrunscript-argsTest.sh	2014-01-26 11:38:08.556796679 +0800
@@ -33,7 +33,7 @@
 . ${TESTSRC-.}/common.sh
 
 setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
 if [ $? -eq 2 ]; then
     echo "No js engine found and engine not required; test vacuously passes."
     exit 0
--- old/test/sun/tools/jrunscript/jrunscript-cpTest.sh	2014-01-26 11:38:09.236796670 +0800
+++ new/test/sun/tools/jrunscript/jrunscript-cpTest.sh	2014-01-26 11:38:09.080796672 +0800
@@ -33,14 +33,14 @@
 . ${TESTSRC-.}/common.sh
 
 setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
 if [ $? -eq 2 ]; then
     echo "No js engine found and engine not required; test vacuously passes."
     exit 0
 fi
 
 rm -f Hello.class
-${JAVAC} ${TESTSRC}/Hello.java -d .
+${JAVAC} ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} ${TESTSRC}/Hello.java -d .
 
 # we check whether classpath setting for app classes
 # work with jrunscript. Script should be able to
--- old/test/sun/tools/jrunscript/jrunscript-eTest.sh	2014-01-26 11:38:09.764796663 +0800
+++ new/test/sun/tools/jrunscript/jrunscript-eTest.sh	2014-01-26 11:38:09.612796665 +0800
@@ -33,7 +33,7 @@
 . ${TESTSRC-.}/common.sh
 
 setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
 if [ $? -eq 2 ]; then
     echo "No js engine found and engine not required; test vacuously passes."
     exit 0
--- old/test/sun/tools/jrunscript/jrunscript-fTest.sh	2014-01-26 11:38:10.288796656 +0800
+++ new/test/sun/tools/jrunscript/jrunscript-fTest.sh	2014-01-26 11:38:10.144796658 +0800
@@ -33,7 +33,7 @@
 . ${TESTSRC-.}/common.sh
 
 setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
 if [ $? -eq 2 ]; then
     echo "No js engine found and engine not required; test vacuously passes."
     exit 0
--- old/test/sun/tools/jrunscript/jrunscriptTest.sh	2014-01-26 11:38:10.820796649 +0800
+++ new/test/sun/tools/jrunscript/jrunscriptTest.sh	2014-01-26 11:38:10.660796651 +0800
@@ -33,7 +33,7 @@
 . ${TESTSRC-.}/common.sh
 
 setup
-${JAVA} -cp ${TESTCLASSES} CheckEngine
+${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CheckEngine
 if [ $? -eq 2 ]; then
     echo "No js engine found and engine not required; test vacuously passes."
     exit 0
--- old/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	2014-01-26 11:38:11.352796642 +0800
+++ new/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh	2014-01-26 11:38:11.196796644 +0800
@@ -100,11 +100,11 @@
 set -vx
 #
 #Compile.  tools.jar is required on the classpath.
-${TESTJAVA}/bin/javac -d "${TESTCLASSES}" ${CP} -g \
+${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d "${TESTCLASSES}" ${CP} -g \
                          "${TESTSRC}"/"${TARGETCLASS}".java
 #
 #Run the test class, again with the classpath we need:
-${TESTJAVA}/bin/java ${CP} ${TARGETCLASS}
+${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} ${CP} ${TARGETCLASS}
 status=$?
 echo "test status was: $status"
 if [ $status -eq "0" ];
--- old/test/tools/launcher/6842838/Test6842838.sh	2014-01-26 11:38:11.868796635 +0800
+++ new/test/tools/launcher/6842838/Test6842838.sh	2014-01-26 11:38:11.716796637 +0800
@@ -68,9 +68,9 @@
 fi
 
 BADFILE=newbadjar.jar
-${JAVA_EXE} ${TESTVMOPTS} -version
-${JAVA_EXE} ${TESTVMOPTS} -cp ${TESTCLASSES} CreateBadJar ${BADFILE} "META-INF/MANIFEST.MF"
-LD_PRELOAD=${LIBUMEM} ${JAVA_EXE} -jar ${BADFILE} > test.out 2>&1
+${JAVA_EXE} ${TESTVMOPTS} ${TESTJAVAOPTS} -version
+${JAVA_EXE} ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES} CreateBadJar ${BADFILE} "META-INF/MANIFEST.MF"
+LD_PRELOAD=${LIBUMEM} ${JAVA_EXE} ${TESTVMOPTS} ${TESTJAVAOPTS} -jar ${BADFILE} > test.out 2>&1
 
 grep "Invalid or corrupt jarfile" test.out
 exit $?
--- old/test/tools/launcher/ClassPathWildCard.sh	2014-01-26 11:38:12.424796628 +0800
+++ new/test/tools/launcher/ClassPathWildCard.sh	2014-01-26 11:38:12.260796630 +0800
@@ -121,11 +121,11 @@
 
   # Test JAR files first
   rm -f TestA${OUTEXT}
-  $JAVA${variant} -classpath JarDir/"*"$NOOP TestA || exit 1
+  $JAVA${variant} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath JarDir/"*"$NOOP TestA || exit 1
   CheckFail TestA
 
   rm -f TestB${OUTEXT}
-  $JAVA${variant} -classpath JarDir/"*"$NOOP TestB || exit 1
+  $JAVA${variant} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath JarDir/"*"$NOOP TestB || exit 1
   CheckFail TestB
 
 
@@ -134,11 +134,11 @@
   cp TestD/*.class JarDir
 
   rm -f TestC${OUTEXT}
-  $JAVA${variant} -classpath JarDir${PATHSEP}JarDir/"*"$NOOP TestC || exit 1
+  $JAVA${variant} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath JarDir${PATHSEP}JarDir/"*"$NOOP TestC || exit 1
   CheckFail TestC
 
   rm -f TestD${OUTEXT}
-  $JAVA${variant} -classpath JarDir${PATHSEP}JarDir/"*"$NOOP TestD || exit 1
+  $JAVA${variant} ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath JarDir${PATHSEP}JarDir/"*"$NOOP TestD || exit 1
   CheckFail TestD
 }
 
--- old/test/tools/launcher/MultipleJRE.sh	2014-01-26 11:38:12.960796621 +0800
+++ new/test/tools/launcher/MultipleJRE.sh	2014-01-26 11:38:12.800796623 +0800
@@ -54,8 +54,8 @@
   exit 1
 fi
 
-JAVAEXE="$TESTJAVA/bin/java ${TESTVMOPTS}"
-JAVA="$TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES"
+JAVAEXE="$TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS}"
+JAVA="$TESTJAVA/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath $TESTCLASSES"
 JAR="$COMPILEJAVA/bin/jar ${TESTTOOLVMOPTS}"
 OS=`uname -s`;