Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 8988:e5c39738ce1f
8003890: corelibs test scripts should pass TESTVMOPTS
Reviewed-by: chegar, alanb
Contributed-by: Mark Sheppard <mark.sheppard@oracle.com>
line wrap: on
line diff
--- a/test/com/oracle/net/sanity.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/com/oracle/net/sanity.sh Tue Oct 18 00:18:15 2016 +0100 @@ -63,4 +63,4 @@ export CLASSPATH # Run sanity test (IPv4-only for now) -$JAVA -Djava.net.preferIPv4Stack=true Sanity ${IB_LINKS} +$JAVA ${TESTVMOPTS} -Djava.net.preferIPv4Stack=true Sanity ${IB_LINKS}
--- a/test/com/sun/corba/cachedSocket/7056731.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/com/sun/corba/cachedSocket/7056731.sh Tue Oct 18 00:18:15 2016 +0100 @@ -64,12 +64,12 @@ sleep 2 #give orbd time to start echo "started orb" echo "starting server" -${TESTJAVA}${FS}bin${FS}java -cp . HelloServer -ORBInitialPort $PORT -ORBInitialHost localhost & +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -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 -cp . -agentlib:jdwp=transport=dt_socket,server=y,address=8000 HelloClient -ORBInitialPort $PORT -ORBInitialHost localhost > client.$$ 2>&1 & +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -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
--- a/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh Tue Oct 18 00:18:15 2016 +0100 @@ -59,7 +59,7 @@ runOne() { echo "runOne $@" - $TESTJAVA/bin/java -classpath $TESTCLASSES $@ || exit 3 + $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 3 } solaris_swap_size()
--- a/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Tue Oct 18 00:18:15 2016 +0100 @@ -43,7 +43,7 @@ { echo "runOne $@" $TESTJAVA/bin/javac -d $TESTCLASSES $TESTSRC/$@.java || exit 2 - $TESTJAVA/bin/java -classpath $TESTCLASSES $@ || exit 3 + $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 3 } # Test GetMaxFileDescriptorCount if we are running on Unix
--- a/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Tue Oct 18 00:18:15 2016 +0100 @@ -43,7 +43,7 @@ { echo "runOne $@" $TESTJAVA/bin/javac -d $TESTCLASSES $TESTSRC/$@.java || exit 2 - $TESTJAVA/bin/java -classpath $TESTCLASSES $@ || exit 3 + $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 3 } # Test GetOpenFileDescriptorCount if we are running on Unix
--- a/test/com/sun/tools/extcheck/TestExtcheckArgs.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/com/sun/tools/extcheck/TestExtcheckArgs.sh Tue Oct 18 00:18:15 2016 +0100 @@ -39,7 +39,7 @@ exit $rc fi -${TESTJAVA}/bin/java -classpath ${TESTJAVA}/lib/tools.jar${PS}${TESTCLASSES} TestExtcheckArgs +${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTJAVA}/lib/tools.jar${PS}${TESTCLASSES} TestExtcheckArgs rc=$? if [ $rc != 0 ]; then echo Execution failure with exit status $rc
--- a/test/demo/zipfs/basic.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/demo/zipfs/basic.sh Tue Oct 18 00:18:15 2016 +0100 @@ -53,7 +53,7 @@ go() { echo "" - ${TESTJAVA}/bin/java $1 $2 $3 2>&1 + ${TESTJAVA}/bin/java ${TESTVMOPTS} $1 $2 $3 2>&1 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi }
--- a/test/java/io/File/GetXSpace.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/File/GetXSpace.sh Tue Oct 18 00:18:15 2016 +0100 @@ -53,7 +53,7 @@ } runTest() { - ${TESTJAVA}/bin/java -cp ${TESTCLASSES} GetXSpace $* + ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} GetXSpace $* if [ $? -eq 0 ] then echo "Passed" else
--- a/test/java/io/File/MacPathTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/File/MacPathTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -36,4 +36,4 @@ TESTCLASSES=. fi -export LC_ALL=en_US.UTF-8 ;${TESTJAVA}/bin/java -cp ${TESTCLASSES} MacPathTest +export LC_ALL=en_US.UTF-8 ;${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} MacPathTest
--- a/test/java/io/File/basic.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/File/basic.sh Tue Oct 18 00:18:15 2016 +0100 @@ -35,7 +35,7 @@ printf "%s" "xyzzyN" > x.Basic.rw touch x.Basic.ro; chmod ugo-w x.Basic.ro mkdir x.Basic.dir -if $TESTJAVA/bin/java $* -classpath "$TESTCLASSES" Basic; then +if $TESTJAVA/bin/java ${TESTVMOPTS} $* -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)
--- a/test/java/io/FileOutputStream/FileOpen.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/FileOutputStream/FileOpen.sh Tue Oct 18 00:18:15 2016 +0100 @@ -50,20 +50,20 @@ ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\FileOpenNeg.java echo "Opening Writable Normal File.." - ${TESTJAVA}/bin/java FileOpenPos ${hfile} + ${TESTJAVA}/bin/java ${TESTVMOPTS} FileOpenPos ${hfile} echo "Opening Writable Hidden File.." ${ATTRIB} +h ${hfile} - ${TESTJAVA}/bin/java FileOpenNeg ${hfile} + ${TESTJAVA}/bin/java ${TESTVMOPTS} FileOpenNeg ${hfile} echo "Opening Read-Only Normal File.." ${ATTRIB} -h ${hfile} ${ATTRIB} +r ${hfile} - ${TESTJAVA}/bin/java FileOpenNeg ${hfile} + ${TESTJAVA}/bin/java ${TESTVMOPTS} FileOpenNeg ${hfile} echo "Opening Read-Only Hidden File.." ${ATTRIB} +h ${hfile} - ${TESTJAVA}/bin/java FileOpenNeg ${hfile} + ${TESTJAVA}/bin/java ${TESTVMOPTS} FileOpenNeg ${hfile} rm -f ${hfile} exit
--- a/test/java/io/Serializable/class/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/Serializable/class/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -45,85 +45,85 @@ rm -f A.java cp ${TESTSRC}/NonSerialA_1.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -s A -${TESTJAVA}/bin/java Test -d +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -d echo echo Write NonSerial1, Read NonSerial2 rm -f A.java cp ${TESTSRC}/NonSerialA_1.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -s A +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A rm -f A.java cp ${TESTSRC}/NonSerialA_2.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -d +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -d echo echo Write NonSerial1, Read Serial1 rm -f A.java cp ${TESTSRC}/NonSerialA_1.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -s A +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A rm -f A.java cp ${TESTSRC}/SerialA_1.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -d +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -d echo echo Write Serial1, Read NonSerial1 rm -f A.java cp ${TESTSRC}/SerialA_1.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -s A +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A rm -f A.java cp ${TESTSRC}/NonSerialA_1.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -doe +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -doe echo echo Write Serial1, Read Serial2 rm -f A.java cp ${TESTSRC}/SerialA_1.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -s A +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A rm -f A.java cp ${TESTSRC}/SerialA_2.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -d +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -d echo echo Write Serial2, Read Serial1 rm -f A.java cp ${TESTSRC}/SerialA_2.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -s A +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A rm -f A.java cp ${TESTSRC}/SerialA_1.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -d +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -d echo echo Write Serial1, Read Serial3 rm -f A.java cp ${TESTSRC}/SerialA_1.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -s A +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A rm -f A.java cp ${TESTSRC}/SerialA_3.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -de +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -de echo echo Write Serial3, Read Serial1 rm -f A.java cp ${TESTSRC}/SerialA_3.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -s A +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -s A rm -f A.java cp ${TESTSRC}/SerialA_1.java A.java ${TESTJAVA}/bin/javac A.java -${TESTJAVA}/bin/java Test -de +${TESTJAVA}/bin/java ${TESTVMOPTS} Test -de echo echo Passed
--- a/test/java/io/Serializable/evolution/AddedExternField/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/Serializable/evolution/AddedExternField/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -27,7 +27,7 @@ rm *.class tmp.ser javac WriteAddedField.java -java WriteAddedField +java ${TESTVMOPTS} WriteAddedField rm *.class javac ReadAddedField.java -java ReadAddedField +java ${TESTVMOPTS} ReadAddedField
--- a/test/java/io/Serializable/evolution/RenamePackage/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/Serializable/evolution/RenamePackage/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -86,13 +86,13 @@ # Run Case 1. Map test.SerialDriver within stream to install.SerialDriver. CLASSPATH="${TESTCLASSES}/oclasses${PS}${TESTCLASSES}/share"; export CLASSPATH; -${JAVA} test.SerialDriver -s +${JAVA} ${TESTVMOPTS} test.SerialDriver -s CLASSPATH="${TESTCLASSES}/nclasses${PS}${TESTCLASSES}/share"; export CLASSPATH; -${JAVA} install.SerialDriver -d +${JAVA} ${TESTVMOPTS} 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} install.SerialDriver -s +${JAVA} ${TESTVMOPTS} install.SerialDriver -s CLASSPATH="${TESTCLASSES}/oclasses${PS}${TESTCLASSES}/share"; export CLASSPATH; -${JAVA} test.SerialDriver -d +${JAVA} ${TESTVMOPTS} test.SerialDriver -d
--- a/test/java/io/Serializable/maskSyntheticModifier/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/Serializable/maskSyntheticModifier/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -41,5 +41,5 @@ set -ex cp ${TESTSRC}/Foo.class . ${TESTJAVA}/bin/javac -d . ${TESTSRC}/Test.java -${TESTJAVA}/bin/java Test +${TESTJAVA}/bin/java ${TESTVMOPTS} Test rm -f *.class
--- a/test/java/io/Serializable/packageAccess/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/Serializable/packageAccess/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -45,5 +45,5 @@ ${TESTJAVA}/bin/jar cf foo.jar B.class D.class rm -f B.class D.class -${TESTJAVA}/bin/java Test +${TESTJAVA}/bin/java ${TESTVMOPTS} Test rm -f *.class *.jar
--- a/test/java/io/Serializable/resolveClass/consTest/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/Serializable/resolveClass/consTest/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -44,5 +44,5 @@ ${TESTJAVA}/bin/jar cf boot.jar *.class rm -f *.class ${TESTJAVA}/bin/javac -classpath boot.jar -d . ${TESTSRC}/Test.java -${TESTJAVA}/bin/java -Xbootclasspath/a:boot.jar Test +${TESTJAVA}/bin/java ${TESTVMOPTS} -Xbootclasspath/a:boot.jar Test rm -f *.class *.jar
--- a/test/java/io/Serializable/resolveClass/deserializeButton/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/Serializable/resolveClass/deserializeButton/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -46,5 +46,5 @@ ${TESTJAVA}/bin/jar cf cb.jar *.class rm -f *.class ${TESTJAVA}/bin/javac -d . ${TESTSRC}/Test.java -${TESTJAVA}/bin/java Test +${TESTJAVA}/bin/java ${TESTVMOPTS} Test rm -f *.class *.jar
--- a/test/java/io/Serializable/subclass/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/Serializable/subclass/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -25,6 +25,6 @@ # @bug 4100915 mkdir classes javac -d classes *.java -java -classpath classes -Djava.policy=Allow.policy Test +java ${TESTVMOPTS} -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
--- a/test/java/io/Serializable/superclassDataLoss/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/Serializable/superclassDataLoss/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -46,5 +46,5 @@ rm -f A.class B.class ${TESTJAVA}/bin/javac -d . ${TESTSRC}/Test.java -${TESTJAVA}/bin/java Test +${TESTJAVA}/bin/java ${TESTVMOPTS} Test rm -f *.class *.jar
--- a/test/java/io/Serializable/unnamedPackageSwitch/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/io/Serializable/unnamedPackageSwitch/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -41,4 +41,4 @@ set -ex ${TESTJAVA}/bin/javac -d . ${TESTSRC}/A.java ${TESTSRC}/Test.java -${TESTJAVA}/bin/java Test +${TESTJAVA}/bin/java ${TESTVMOPTS} Test
--- a/test/java/lang/Class/forName/NonJavaNames.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/lang/Class/forName/NonJavaNames.sh Tue Oct 18 00:18:15 2016 +0100 @@ -94,7 +94,7 @@ COPYSEMICOLON="cp ${TESTSRC}/classes/semicolon.class ${TESTCLASSES}/;.class" $COPYSEMICOLON -JAVA="$TESTJAVA/bin/java -classpath ${TESTSRC}/classes${SEP}${TESTCLASSES}" +JAVA="$TESTJAVA/bin/java ${TESTVMOPTS} -classpath ${TESTSRC}/classes${SEP}${TESTCLASSES}" $JAVA NonJavaNames RESULT=$?
--- a/test/java/lang/ClassLoader/Assert.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/lang/ClassLoader/Assert.sh Tue Oct 18 00:18:15 2016 +0100 @@ -65,7 +65,7 @@ ${TESTJAVA}/bin/javac Assert.java -${TESTJAVA}/bin/java Assert +${TESTJAVA}/bin/java ${TESTVMOPTS} Assert result=$? if [ $result -eq 0 ]
--- a/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Tue Oct 18 00:18:15 2016 +0100 @@ -101,6 +101,7 @@ # run test ${TESTJAVA}${FS}bin${FS}java \ + ${TESTVMOPTS} \ -verbose:class -XX:+TraceClassLoading -cp . \ -Dtest.classes=${TESTCLASSES} \ Starter cross
--- a/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Tue Oct 18 00:18:15 2016 +0100 @@ -96,6 +96,7 @@ # run test ${TESTJAVA}${FS}bin${FS}java \ + ${TESTVMOPTS} \ -verbose:class -XX:+TraceClassLoading -cp . \ -Dtest.classes=${TESTCLASSES} \ Starter one-way
--- a/test/java/lang/ClassLoader/getdotresource.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/lang/ClassLoader/getdotresource.sh Tue Oct 18 00:18:15 2016 +0100 @@ -33,5 +33,5 @@ if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi # now start the test -${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetDotResource +${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetDotResource
--- a/test/java/lang/Runtime/exec/setcwd.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/lang/Runtime/exec/setcwd.sh Tue Oct 18 00:18:15 2016 +0100 @@ -37,5 +37,5 @@ cp ${TESTCLASSES}/SetCwd.class foo # now start the test -${TESTJAVA}/bin/java SetCwd +${TESTJAVA}/bin/java ${TESTVMOPTS} SetCwd
--- a/test/java/lang/StringCoding/CheckEncodings.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/lang/StringCoding/CheckEncodings.sh Tue Oct 18 00:18:15 2016 +0100 @@ -49,7 +49,7 @@ echo "Testing:" ${1} set LC_ALL="${1}"; export LC_ALL locale - ${TESTJAVA}/bin/java -version 2>&1 + ${TESTJAVA}/bin/java ${TESTVMOPTS} -version 2>&1 expectPass $? }
--- a/test/java/lang/System/finalization/FinExit.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/lang/System/finalization/FinExit.sh Tue Oct 18 00:18:15 2016 +0100 @@ -26,7 +26,7 @@ # # We only want the first character, Windows might add CRLF -x=`$TESTJAVA/bin/java -cp "$TESTCLASSES" FinExit | cut -c1` +x=`$TESTJAVA/bin/java ${TESTVMOPTS} -cp "$TESTCLASSES" FinExit | cut -c1` echo $x if [ "x$x" != "x1" ]; then echo On-exit finalizer invoked twice
--- a/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Tue Oct 18 00:18:15 2016 +0100 @@ -69,7 +69,7 @@ cp ${TESTSRC}${FS}*.java . ${TESTJAVA}${FS}bin${FS}javac -d classes A.java B.java C.java ${TESTJAVA}${FS}bin${FS}javac Main.java -${TESTJAVA}${FS}bin${FS}java Main +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} Main result=$? if [ $result -eq 0 ] then @@ -78,7 +78,7 @@ echo "Failed 1 of 2" exit $result fi -${TESTJAVA}${FS}bin${FS}java Main foo +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} Main foo result=$? if [ $result -eq 0 ] then
--- a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Tue Oct 18 00:18:15 2016 +0100 @@ -52,7 +52,7 @@ runOne() { echo "$TESTJAVA/bin/java -classpath $TESTCLASSES $@" - $TESTJAVA/bin/java -classpath $TESTCLASSES $@ + $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ } # Retry 5 times to be more resilent to system load fluctation.
--- a/test/java/net/Authenticator/B4933582.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/Authenticator/B4933582.sh Tue Oct 18 00:18:15 2016 +0100 @@ -45,5 +45,5 @@ esac ${TESTJAVA}${FS}bin${FS}javac -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 -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}." B4933582 first -${TESTJAVA}${FS}bin${FS}java -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}." B4933582 second +${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
--- a/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Tue Oct 18 00:18:15 2016 +0100 @@ -49,4 +49,4 @@ ;; esac -${TESTJAVA}${FILESEP}bin${FILESEP}java -Xbootclasspath/p:${TESTCLASSES} ADatagramSocket true +${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} -Xbootclasspath/p:${TESTCLASSES} ADatagramSocket true
--- a/test/java/net/InetAddress/ptr/lookup.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/InetAddress/ptr/lookup.sh Tue Oct 18 00:18:15 2016 +0100 @@ -53,13 +53,13 @@ # IPv4 reverse lookup echo '' -OUT1=`$JAVA -Djava.net.preferIPv4Stack=true Lookup -q=PTR $ADDR` +OUT1=`$JAVA ${TESTVMOPTS} -Djava.net.preferIPv4Stack=true Lookup -q=PTR $ADDR` echo "(IPv4) $ADDR --> $OUT1" # reverse lookup (default) echo '' -OUT2=`$JAVA Lookup -q=PTR $ADDR` +OUT2=`$JAVA ${TESTVMOPTS} Lookup -q=PTR $ADDR` echo "(default) $ADDR --> $OUT2"
--- a/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh Tue Oct 18 00:18:15 2016 +0100 @@ -45,4 +45,4 @@ ulimit -n 1024 fi -${TESTJAVA}/bin/java AcceptCauseFileDescriptorLeak +${TESTJAVA}/bin/java ${TESTVMOPTS} AcceptCauseFileDescriptorLeak
--- a/test/java/net/Socket/OldSocketImpl.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/Socket/OldSocketImpl.sh Tue Oct 18 00:18:15 2016 +0100 @@ -50,7 +50,7 @@ # with 1.3 and in OldStyleImpl.jar # run -${TESTJAVA}${FS}bin${FS}java -cp ${TESTSRC}${FS}OldSocketImpl.jar OldSocketImpl +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTSRC}${FS}OldSocketImpl.jar OldSocketImpl result=$? if [ "$result" -ne "0" ]; then exit 1
--- a/test/java/net/URL/B5086147.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/URL/B5086147.sh Tue Oct 18 00:18:15 2016 +0100 @@ -47,7 +47,7 @@ failures=0 echo '' -${TESTJAVA}${FS}bin${FS}java B5086147 +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} B5086147 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi if [ "$failures" != "0" ]; then
--- a/test/java/net/URL/runconstructor.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/URL/runconstructor.sh Tue Oct 18 00:18:15 2016 +0100 @@ -50,7 +50,7 @@ go() { echo '' - ${TESTJAVA}${FS}bin${FS}java Constructor $1 + ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} Constructor $1 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi }
--- a/test/java/net/URLClassLoader/B5077773.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/URLClassLoader/B5077773.sh Tue Oct 18 00:18:15 2016 +0100 @@ -61,5 +61,5 @@ ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}B5077773.java WD=`pwd` -${TESTJAVA}${FS}bin${FS}java B5077773 +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} B5077773
--- a/test/java/net/URLClassLoader/getresourceasstream/test.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/URLClassLoader/getresourceasstream/test.sh Tue Oct 18 00:18:15 2016 +0100 @@ -46,11 +46,11 @@ ${TESTJAVA}/bin/javac -d . ${TESTSRC}/Test.java cp ${TESTSRC}/test.jar . -${TESTJAVA}/bin/java Test +${TESTJAVA}/bin/java ${TESTVMOPTS} Test checkExit # try with security manager -${TESTJAVA}/bin/java -Djava.security.policy=file:./policy -Djava.security.manager Test +${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.security.policy=file:./policy -Djava.security.manager Test checkExit exit 0
--- a/test/java/net/URLClassLoader/sealing/checksealed.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/URLClassLoader/sealing/checksealed.sh Tue Oct 18 00:18:15 2016 +0100 @@ -56,7 +56,7 @@ CLASSPATH=".${PS}${TESTSRC}${FS}a${PS}${TESTSRC}${FS}b.jar" ${TESTJAVA}${FS}bin${FS}javac -classpath "${CLASSPATH}" -d . ${TESTSRC}${FS}CheckSealed.java -${TESTJAVA}${FS}bin${FS}java -cp "${CLASSPATH}" CheckSealed 1 +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp "${CLASSPATH}" CheckSealed 1 if [ $? != 0 ]; then exit 1; fi -${TESTJAVA}${FS}bin${FS}java -cp "${CLASSPATH}" CheckSealed 2 +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp "${CLASSPATH}" CheckSealed 2 if [ $? != 0 ]; then exit 1; fi
--- a/test/java/net/URLConnection/6212146/test.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/URLConnection/6212146/test.sh Tue Oct 18 00:18:15 2016 +0100 @@ -67,7 +67,7 @@ WD=`pwd` ulimit -H -n 300 -${TESTJAVA}${FS}bin${FS}java Test ${WD}/jars/ test.jar +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} Test ${WD}/jars/ test.jar result=$? rm -rf jars exit $?
--- a/test/java/net/URLConnection/UNCTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/net/URLConnection/UNCTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -36,7 +36,7 @@ case "$OS" in Windows_95 | Windows_98 | Windows_NT ) ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\UNCTest.java - ${TESTJAVA}/bin/java UNCTest ${UNC} + ${TESTJAVA}/bin/java ${TESTVMOPTS} UNCTest ${UNC} exit ;;
--- a/test/java/nio/Buffer/LimitDirectMemory.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/nio/Buffer/LimitDirectMemory.sh Tue Oct 18 00:18:15 2016 +0100 @@ -34,7 +34,7 @@ runTest() { echo "Testing: $*" - ${TESTJAVA}/bin/java $* + ${TESTJAVA}/bin/java ${TESTVMOPTS} $* if [ $? -eq 0 ] then echo "--- passed as expected" else @@ -43,10 +43,11 @@ fi } + launchFail() { echo "Testing: -XX:MaxDirectMemorySize=$* -cp ${TESTCLASSES} \ LimitDirectMemory true DEFAULT DEFAULT+1M" - ${TESTJAVA}/bin/java -XX:MaxDirectMemorySize=$* -cp ${TESTCLASSES} \ + ${TESTJAVA}/bin/java ${TESTVMOPTS} -XX:MaxDirectMemorySize=$* -cp ${TESTCLASSES} \ LimitDirectMemory true DEFAULT DEFAULT+1M > ${TMP1} 2>&1 cat ${TMP1} cat ${TMP1} | grep -s "Unrecognized VM option: \'MaxDirectMemorySize="
--- a/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh Tue Oct 18 00:18:15 2016 +0100 @@ -46,7 +46,7 @@ -C "${TESTCLASSES}" Attack.class echo "Running test ..." -$JAVA -XX:-UseVMInterruptibleIO \ - -Xbootclasspath/a:"${TESTCLASSES}/Privileged.jar" \ - -classpath "${TESTCLASSES}" \ - AsExecutor +$JAVA ${TESTVMOPTS} \ + -Xbootclasspath/a:"${TESTCLASSES}/Privileged.jar" \ + -classpath "${TESTCLASSES}" \ + AsExecutor
--- a/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh Tue Oct 18 00:18:15 2016 +0100 @@ -51,7 +51,7 @@ go() { echo '' - $JAVA $1 $2 $3 2>&1 + $JAVA ${TESTVMOPTS} $1 $2 $3 2>&1 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi }
--- a/test/java/nio/charset/Charset/default.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/nio/charset/Charset/default.sh Tue Oct 18 00:18:15 2016 +0100 @@ -64,7 +64,7 @@ ecs="$1"; shift echo -n "$L: " - cs="`LC_ALL=$L $JAVA -cp $TESTCLASSES Default`" + cs="`LC_ALL=$L $JAVA ${TESTVMOPTS} -cp $TESTCLASSES Default`" if [ $? != 0 ]; then exit 1 elif [ "`tolower $cs`" != "`tolower $ecs`" ]; then
--- a/test/java/nio/charset/coders/CheckSJISMappingProp.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/nio/charset/coders/CheckSJISMappingProp.sh Tue Oct 18 00:18:15 2016 +0100 @@ -51,7 +51,7 @@ } -JAVA="${TESTJAVA}/bin/java -cp ${TESTCLASSES}" +JAVA="${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES}" runTest() { echo "Testing:" ${1} LC_ALL="$1" ; export LC_ALL
--- a/test/java/nio/charset/spi/basic.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/nio/charset/spi/basic.sh Tue Oct 18 00:18:15 2016 +0100 @@ -112,7 +112,7 @@ av="$av -Djava.security.manager -Djava.security.policy==$TESTSRC/charsetProvider.sp";; esac - if (set -x; $JAVA $av Test $css) 2>&1; then + if (set -x; $JAVA ${TESTVMOPTS} $av Test $css) 2>&1; then continue; else failures=`expr $failures + 1`
--- a/test/java/nio/file/Files/delete_on_close.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/nio/file/Files/delete_on_close.sh Tue Oct 18 00:18:15 2016 +0100 @@ -51,7 +51,7 @@ TMPFILE="$$.tmp" touch $TMPFILE -$JAVA DeleteOnClose $TMPFILE 2>&1 +$JAVA ${TESTVMOPTS} DeleteOnClose $TMPFILE 2>&1 if [ $? != 0 ]; then exit 1; fi if [ -f $TMPFILE ]; then echo "$TMPFILE was not deleted"
--- a/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh Tue Oct 18 00:18:15 2016 +0100 @@ -56,7 +56,7 @@ failures=0 # print the file tree and compare output with find(1) -$JAVA PrintFileTree "$ROOT" > out1 +$JAVA ${TESTVMOPTS} PrintFileTree "$ROOT" > out1 find "$ROOT" > out2 diff out1 out2 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi @@ -66,26 +66,26 @@ # not. For that reason we run PrintFileTree with the -printCycles # option when the output without this option differs to find(1). find "$ROOT" -follow > out1 -$JAVA PrintFileTree -follow "$ROOT" > out2 +$JAVA ${TESTVMOPTS} PrintFileTree -follow "$ROOT" > out2 diff out1 out2 if [ $? != 0 ]; then # re-run printing cycles to stdout - $JAVA PrintFileTree -follow -printCycles "$ROOT" > out2 + $JAVA ${TESTVMOPTS} PrintFileTree -follow -printCycles "$ROOT" > out2 diff out1 out2 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi fi # test SKIP_SIBLINGS -$JAVA SkipSiblings "$ROOT" +$JAVA ${TESTVMOPTS} SkipSiblings "$ROOT" if [ $? != 0 ]; then failures=`expr $failures + 1`; fi # test TERMINATE -$JAVA TerminateWalk "$ROOT" +$JAVA ${TESTVMOPTS} TerminateWalk "$ROOT" if [ $? != 0 ]; then failures=`expr $failures + 1`; fi # test maxDepth -$JAVA MaxDepth "$ROOT" +$JAVA ${TESTVMOPTS} MaxDepth "$ROOT" if [ $? != 0 ]; then failures=`expr $failures + 1`; fi # clean-up
--- a/test/java/nio/file/Path/MacPathTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/nio/file/Path/MacPathTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -36,4 +36,4 @@ TESTCLASSES=. fi -export LC_ALL=en_US.UTF-8; ${TESTJAVA}/bin/java -cp ${TESTCLASSES} MacPathTest +export LC_ALL=en_US.UTF-8; ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} MacPathTest
--- a/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Tue Oct 18 00:18:15 2016 +0100 @@ -28,7 +28,7 @@ # set to the impl's class loader) when the impl is activated. # @library ../../../testlibrary # @build TestLibrary RMID ActivationLibrary -# ExtLoadedImplTest ExtLoadedImpl ExtLoadedImpl_Stub CheckLoader +# @build ExtLoadedImplTest ExtLoadedImpl ExtLoadedImpl_Stub CheckLoader # @run shell ext.sh OS=`uname -s` @@ -51,5 +51,5 @@ mkdir -p ext $TESTJAVA/bin/jar cf ext/ext.jar -C $TESTCLASSES ExtLoadedImpl.class -C $TESTCLASSES ExtLoadedImpl_Stub.class -C $TESTCLASSES CheckLoader.class -$TESTJAVA/bin/java -cp classes -Dtest.src=$TESTSRC -Dtest.classes=$TESTCLASSES -Djava.security.policy=$TESTSRC/security.policy -Djava.ext.dirs=ext ExtLoadedImplTest +$TESTJAVA/bin/java ${TESTVMOPTS} -cp classes -Dtest.src=$TESTSRC -Dtest.classes=$TESTCLASSES -Djava.security.policy=$TESTSRC/security.policy -Djava.ext.dirs=ext ExtLoadedImplTest
--- a/test/java/rmi/registry/readTest/readTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/rmi/registry/readTest/readTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -25,7 +25,7 @@ # @bug 7102369 7094468 7100592 # @library ../../testlibrary # @build TestLibrary -# @summary remove java.rmi.server.codebase property parsing from RegistryImpl +# @summary remove java.rmi.server.codebase property parsing from registyimpl # @run shell readTest.sh OS=`uname -s` @@ -93,7 +93,7 @@ ;; esac # trailing / after code base is important for rmi codebase property. -${TESTJAVA}${FS}bin${FS}java -cp $TEST_CLASSPATH ${ARGS} -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 & +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -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
--- a/test/java/rmi/reliability/benchmark/runSerialBench.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/rmi/reliability/benchmark/runSerialBench.sh Tue Oct 18 00:18:15 2016 +0100 @@ -27,22 +27,22 @@ # used to run the test under JTREG. # # @build bench.BenchInfo bench.HtmlReporter bench.Util bench.Benchmark -# bench.Reporter bench.XmlReporter bench.ConfigFormatException -# bench.Harness bench.TextReporter -# bench.serial.BooleanArrays bench.serial.Booleans -# bench.serial.ByteArrays bench.serial.Bytes bench.serial.CharArrays -# bench.serial.Chars bench.serial.ClassDesc bench.serial.Cons -# bench.serial.CustomDefaultObjTrees bench.serial.CustomObjTrees -# bench.serial.DoubleArrays bench.serial.Doubles -# bench.serial.ExternObjTrees bench.serial.FloatArrays -# bench.serial.Floats bench.serial.GetPutFieldTrees -# bench.serial.IntArrays bench.serial.Ints bench.serial.LongArrays -# bench.serial.Longs bench.serial.Main bench.serial.ObjArrays -# bench.serial.ObjTrees bench.serial.ProxyArrays -# bench.serial.ProxyClassDesc bench.serial.RepeatObjs -# bench.serial.ReplaceTrees bench.serial.ShortArrays -# bench.serial.Shorts bench.serial.SmallObjTrees -# bench.serial.StreamBuffer bench.serial.Strings +# @build bench.Reporter bench.XmlReporter bench.ConfigFormatException +# @build bench.Harness bench.TextReporter +# @build bench.serial.BooleanArrays bench.serial.Booleans +# @build bench.serial.ByteArrays bench.serial.Bytes bench.serial.CharArrays +# @build bench.serial.Chars bench.serial.ClassDesc bench.serial.Cons +# @build bench.serial.CustomDefaultObjTrees bench.serial.CustomObjTrees +# @build bench.serial.DoubleArrays bench.serial.Doubles +# @build bench.serial.ExternObjTrees bench.serial.FloatArrays +# @build bench.serial.Floats bench.serial.GetPutFieldTrees +# @build bench.serial.IntArrays bench.serial.Ints bench.serial.LongArrays +# @build bench.serial.Longs bench.serial.Main bench.serial.ObjArrays +# @build bench.serial.ObjTrees bench.serial.ProxyArrays +# @build bench.serial.ProxyClassDesc bench.serial.RepeatObjs +# @build bench.serial.ReplaceTrees bench.serial.ShortArrays +# @build bench.serial.Shorts bench.serial.SmallObjTrees +# @build bench.serial.StreamBuffer bench.serial.Strings # # @run shell/timeout=1800 runSerialBench.sh # @@ -51,7 +51,7 @@ echo "Starting serialization benchmark " $TESTJAVA/bin/java \ - -server \ + ${TESTVMOPTS} \ -cp $TESTCLASSES \ bench.serial.Main \ -c $TESTSRC/bench/serial/jtreg-config &
--- a/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Tue Oct 18 00:18:15 2016 +0100 @@ -91,7 +91,7 @@ ${TESTSRC}${FILESEP}provider${FILESEP}HashProvider.java # run the test -${TESTJAVA}${FILESEP}bin${FILESEP}java \ +${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \ -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" \ -Djava.awt.headless=true \ ClassLoaderDeadlock
--- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Tue Oct 18 00:18:15 2016 +0100 @@ -66,5 +66,5 @@ JAVA="${TESTJAVA}${FILESEP}bin${FILESEP}java" -${JAVA} -cp "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" Deadlock +${JAVA} ${TESTVMOPTS} -cp "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" Deadlock
--- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Tue Oct 18 00:18:15 2016 +0100 @@ -104,8 +104,8 @@ rm Deadlock2*.class # create serialized object and run the test -${TESTJAVA}${FILESEP}bin${FILESEP}java CreateSerialized -${TESTJAVA}${FILESEP}bin${FILESEP}java -Djava.ext.dirs=${TESTCLASSES}${FILESEP}testlib Deadlock2 +${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} CreateSerialized +${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} -Djava.ext.dirs=${TESTCLASSES}${FILESEP}testlib Deadlock2 STATUS=$? # clean up
--- a/test/java/security/Security/signedfirst/Dyn.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/security/Security/signedfirst/Dyn.sh Tue Oct 18 00:18:15 2016 +0100 @@ -87,7 +87,7 @@ ${TESTSRC}${FILESEP}DynSignedProvFirst.java # run the test -${TESTJAVA}${FILESEP}bin${FILESEP}java \ +${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \ -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \ DynSignedProvFirst
--- a/test/java/security/Security/signedfirst/Static.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/security/Security/signedfirst/Static.sh Tue Oct 18 00:18:15 2016 +0100 @@ -88,7 +88,7 @@ # run the test cd ${TESTSRC}${FILESEP} -${TESTJAVA}${FILESEP}bin${FILESEP}java \ +${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \ -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \ -Djava.security.properties=file:${TESTSRC}${FILESEP}Static.props \ StaticSignedProvFirst
--- a/test/java/security/cert/CertificateFactory/slowstream.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/security/cert/CertificateFactory/slowstream.sh Tue Oct 18 00:18:15 2016 +0100 @@ -46,5 +46,5 @@ esac ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}SlowStream.java -${TESTJAVA}${FS}bin${FS}java -Dtest.src=${TESTSRC} SlowStreamWriter | \ - ${TESTJAVA}${FS}bin${FS}java SlowStreamReader +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Dtest.src=${TESTSRC} SlowStreamWriter | \ + ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} SlowStreamReader
--- a/test/java/util/Currency/PropertiesTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/Currency/PropertiesTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -47,7 +47,7 @@ # Currency dump path #1. Just dump currencies with the bare JRE # run -RUNCMD="${TESTJAVA}${FS}bin${FS}java -classpath ${TESTCLASSES} PropertiesTest -d dump1" +RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} PropertiesTest -d dump1" echo ${RUNCMD} ${RUNCMD} @@ -82,7 +82,7 @@ cp ${TESTSRC}${FS}currency.properties $PROPLOCATION # run -RUNCMD="${WRITABLEJDK}${FS}bin${FS}java -classpath ${TESTCLASSES} PropertiesTest -d dump2" +RUNCMD="${WRITABLEJDK}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} PropertiesTest -d dump2" echo ${RUNCMD} ${RUNCMD}
--- a/test/java/util/Locale/LocaleCategory.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/Locale/LocaleCategory.sh Tue Oct 18 00:18:15 2016 +0100 @@ -47,7 +47,7 @@ # test user.xxx.display user.xxx.format properties # run -RUNCMD="${TESTJAVA}${FS}bin${FS}java -classpath ${TESTCLASSES} -Duser.language.display=ja -Duser.language.format=zh LocaleCategory" +RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Duser.language.display=ja -Duser.language.format=zh LocaleCategory" echo ${RUNCMD} ${RUNCMD} @@ -63,7 +63,7 @@ # test user.xxx properties overriding user.xxx.display/format # run -RUNCMD="${TESTJAVA}${FS}bin${FS}java -classpath ${TESTCLASSES} -Duser.language=en -Duser.language.display=ja -Duser.language.format=zh LocaleCategory" +RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Duser.language=en -Duser.language.display=ja -Duser.language.format=zh LocaleCategory" echo ${RUNCMD} ${RUNCMD}
--- a/test/java/util/PluggableLocale/ExecTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/PluggableLocale/ExecTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -119,9 +119,9 @@ # run if [ "$3" = "true" ] then - RUNCMD="${TESTJAVA}${FS}bin${FS}java -Djava.ext.dirs=${EXTDIRS} $2 " + RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Djava.ext.dirs=${EXTDIRS} $2 " else - RUNCMD="${TESTJAVA}${FS}bin${FS}java -classpath ${CLASSPATHARG} $2 " + RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${CLASSPATHARG} $2 " fi echo ${RUNCMD}
--- a/test/java/util/ResourceBundle/Bug6299235Test.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/ResourceBundle/Bug6299235Test.sh Tue Oct 18 00:18:15 2016 +0100 @@ -75,7 +75,7 @@ cd ${TESTSRC} -${TESTJAVA}/bin/java -cp ${TESTCLASSES} -Djava.ext.dirs=${NEW_EXT_DIR} Bug6299235Test +${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} -Djava.ext.dirs=${NEW_EXT_DIR} Bug6299235Test if [ $? -ne 0 ] then
--- a/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -50,7 +50,7 @@ : ${TESTCLASS:=.} : ${TESTSRC:=.} -${TESTJAVA}/bin/java -esa -cp ${TESTCLASS}${DEL}${TESTSRC} MissingResourceCauseTest +${TESTJAVA}/bin/java ${TESTVMOPTS} -esa -cp ${TESTCLASS}${DEL}${TESTSRC} MissingResourceCauseTest STATUS=$? chmod 666 $UNREADABLE rm -f $UNREADABLE
--- a/test/java/util/ServiceLoader/basic.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/ServiceLoader/basic.sh Tue Oct 18 00:18:15 2016 +0100 @@ -94,7 +94,7 @@ cp="$1"; shift if [ -z "$cp" ]; then cp="$TESTCLASSES"; else cp="$TESTCLASSES$SEP$cp"; fi vmargs="$1"; shift - sh -xc "'$JAVA' -cp $cp $vmargs $T $*" 2>&1 + sh -xc "'$JAVA' ${TESTVMOPTS} -cp $cp $vmargs $T $*" 2>&1 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi }
--- a/test/java/util/TimeZone/OldIDMappingTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/TimeZone/OldIDMappingTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -40,7 +40,7 @@ if [ x"$I" != x ]; then D="-Dsun.timezone.ids.oldmapping=${I}" fi - if ! ${JAVA} ${D} -cp ${TESTCLASSES} OldIDMappingTest -new; then + if ! ${JAVA} ${D} ${TESTVMOPTS} -cp ${TESTCLASSES} OldIDMappingTest -new; then STATUS=1 fi done @@ -51,7 +51,7 @@ if [ "x$I" != x ]; then D="-Dsun.timezone.ids.oldmapping=${I}" fi - if ! ${JAVA} ${D} -cp ${TESTCLASSES} OldIDMappingTest -old; then + if ! ${JAVA} ${D} ${TESTVMOPTS} -cp ${TESTCLASSES} OldIDMappingTest -old; then STATUS=1 fi done
--- a/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh Tue Oct 18 00:18:15 2016 +0100 @@ -54,6 +54,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 -Djava.security.manager \ +${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.security.manager \ -Djava.security.debug=access,failure,policy \ -cp ${TESTCLASSES}/timezonedatetest.jar TimeZoneDatePermissionCheck
--- a/test/java/util/prefs/CheckUserPrefsStorage.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/prefs/CheckUserPrefsStorage.sh Tue Oct 18 00:18:15 2016 +0100 @@ -50,14 +50,14 @@ esac # run CheckUserPrefFirst - creates and stores a user pref -${TESTJAVA}${FS}bin${FS}java -cp ${TESTCLASSES} -Djava.util.prefs.userRoot=. CheckUserPrefFirst +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -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 -cp ${TESTCLASSES} -Djava.util.prefs.userRoot=. CheckUserPrefLater +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} -Djava.util.prefs.userRoot=. CheckUserPrefLater result=$? if [ "$result" -ne "0" ]; then exit 1
--- a/test/java/util/prefs/PrefsSpi.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/prefs/PrefsSpi.sh Tue Oct 18 00:18:15 2016 +0100 @@ -87,17 +87,17 @@ case "`uname`" in Windows*|CYGWIN* ) CPS=';';; *) CPS=':';; esac -Sys "$java" "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \ +Sys "$java" "${TESTVMOPTS}" "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \ -Djava.util.prefs.PreferencesFactory=StubPreferencesFactory \ -Djava.util.prefs.userRoot=. \ PrefsSpi "StubPreferences" -Sys "$java" "-cp" "$TESTCLASSES" \ +Sys "$java" "${TESTVMOPTS}" "-cp" "$TESTCLASSES" \ -Djava.util.prefs.userRoot=. \ PrefsSpi "java.util.prefs.*" -Sys "$java" "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \ +Sys "$java" "${TESTVMOPTS}" "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \ -Djava.util.prefs.userRoot=. \ PrefsSpi "StubPreferences" -Sys "$java" "-cp" "$TESTCLASSES" "-Djava.ext.dirs=extDir" \ +Sys "$java" "${TESTVMOPTS}" "-cp" "$TESTCLASSES" "-Djava.ext.dirs=extDir" \ -Djava.util.prefs.userRoot=. \ PrefsSpi "StubPreferences"
--- a/test/java/util/zip/3GBZipFiles.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/zip/3GBZipFiles.sh Tue Oct 18 00:18:15 2016 +0100 @@ -1,4 +1,3 @@ -# # Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -83,7 +82,7 @@ huge-*) filesize_="$hugeSize" ;; tiny-*) filesize_="$tinySize" ;; esac - sys "$JAVA" "-cp" "$TESTCLASSES" "FileBuilder" \ + sys "$JAVA" ${TESTVMOPTS} "-cp" "$TESTCLASSES" "FileBuilder" \ "$filetype_" "$filename_" "$filesize_" }
--- a/test/java/util/zip/ZipFile/deletetempjar.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/java/util/zip/ZipFile/deletetempjar.sh Tue Oct 18 00:18:15 2016 +0100 @@ -30,7 +30,7 @@ TESTCLASSES=. fi -tmpfile=`$TESTJAVA/bin/java -classpath $TESTCLASSES DeleteTempJar` +tmpfile=`$TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES DeleteTempJar` rc=$? if [ $rc != 0 ]; then echo Unexpected failure with exit status $rc
--- a/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -82,6 +82,7 @@ fi ${TESTJAVA}${FS}bin${FS}java \ + ${TESTVMOPTS} \ -classpath "${TESTSRC}${FS}P1.jar${PS}${TESTSRC}${FS}P2.jar${PS}." \ FailOverTest result=$?
--- a/test/javax/print/applet/AppletPrintLookup.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/javax/print/applet/AppletPrintLookup.sh Tue Oct 18 00:18:15 2016 +0100 @@ -82,7 +82,7 @@ ${TESTJAVA}${SEP}bin${SEP}appletviewer ${TESTCLASSES}${SEP}AppletPrintLookup.html & cd ${TESTCLASSES} -${TESTJAVA}${SEP}bin${SEP}java YesNo +${TESTJAVA}${SEP}bin${SEP}java ${TESTVMOPTS} YesNo if [ $? -ne 0 ] then echo "Test fails!"
--- a/test/javax/script/ProviderTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/javax/script/ProviderTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -45,6 +45,6 @@ echo "Running test ..." -$JAVA -classpath \ +$JAVA ${TESTVMOPTS} -classpath \ "${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \ ProviderTest
--- a/test/javax/security/auth/Subject/doAs/Test.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/javax/security/auth/Subject/doAs/Test.sh Tue Oct 18 00:18:15 2016 +0100 @@ -76,7 +76,7 @@ cd ${TESTSRC}${FS} cd $WD echo $WD -${TESTJAVA}${FS}bin${FS}java -classpath "${TESTCLASSES}${FS}" \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath "${TESTCLASSES}${FS}" \ -Djava.security.manager \ -Djava.security.policy=${TESTSRC}${FS}policy \ Test
--- a/test/lib/security/java.policy/Ext_AllPolicy.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/lib/security/java.policy/Ext_AllPolicy.sh Tue Oct 18 00:18:15 2016 +0100 @@ -77,7 +77,7 @@ ${TESTJAVA}${FS}bin${FS}jar -cvf Ext_AllPolicy.jar Ext_AllPolicy.class rm Ext_AllPolicy.class -${TESTJAVA}${FS}bin${FS}java \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \ -Djava.security.manager -Djava.ext.dirs="${TESTCLASSES}" Ext_AllPolicy exit $?
--- a/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh Tue Oct 18 00:18:15 2016 +0100 @@ -41,4 +41,4 @@ JAVA="${TESTJAVA}/bin/java" CP=${TESTJAVA}${FS}lib${FS}tools.jar${PS}${TESTCLASSES} -${JAVA} -classpath ${CP} MonitorVmStartTerminate +${JAVA} ${TESTVMOPTS} -classpath ${CP} MonitorVmStartTerminate
--- a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -150,7 +150,7 @@ done # Start the manager - this should connect to VM -${TESTJAVA}/bin/java -classpath ${TESTCLASSES}:${TESTJAVA}/lib/tools.jar \ +${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES}:${TESTJAVA}/lib/tools.jar \ TestManager $pid $port true if [ $? != 0 ]; then echo "Test failed"
--- a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -43,8 +43,8 @@ rm -f ${outputfile} # Start VM with given options - echo "+ $JAVA $1 Test" - $JAVA $1 TestApplication > ${outputfile}& + echo "+ $JAVA ${TESTVMOPTS} $1 Test" + $JAVA ${TESTVMOPTS} $1 TestApplication > ${outputfile}& pid=$! # Wait for managed VM to startup @@ -64,7 +64,7 @@ done # Start the manager - this should connect to VM - sh -xc "$JAVA -classpath ${TESTCLASSES}:${TESTJAVA}/lib/tools.jar \ + sh -xc "$JAVA ${TESTVMOPTS} -classpath ${TESTCLASSES}:${TESTJAVA}/lib/tools.jar \ TestManager $pid $port" 2>&1 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi } @@ -112,7 +112,7 @@ # Test 4 - sanity check arguments to management-agent.jar echo ' ' -sh -xc "${JAVA} -javaagent:${AGENT}=com.sun.management.jmxremote.port=7775,\ +sh -xc "${JAVA} ${TESTVMOPTS} -javaagent:${AGENT}=com.sun.management.jmxremote.port=7775,\ com.sun.management.jmxremote.authenticate=false,com.sun.management.jmxremote.ssl=false \ TestApplication -exit" 2>&1 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
--- a/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -104,18 +104,18 @@ go() { echo '' - sh -xc "$JAVA $1 $2 $3 $4 $5 $6 $7 $8" 2>&1 + sh -xc "$JAVA ${TESTVMOPTS} $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 $mp $pp Null" 2>&1 +sh -xc "$JAVA ${TESTVMOPTS} $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 $mp $pp Null" 2>&1 +sh -xc "$JAVA ${TESTVMOPTS} $mp $pp Null" 2>&1 if [ $? = 0 ]; then failures=`expr $failures + 1`; fi # Reset the file permissions on the generated password file
--- a/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -101,18 +101,18 @@ go() { echo '' - sh -xc "$JAVA $1 $2 $3 $4 $5 $6 $7 $8" 2>&1 + sh -xc "$JAVA ${TESTVMOPTS} $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 $mp $pp Dummy" 2>&1 +sh -xc "$JAVA ${TESTVMOPTS} $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 $mp $pp Dummy" 2>&1 +sh -xc "$JAVA ${TESTVMOPTS} $mp $pp Dummy" 2>&1 if [ $? = 0 ]; then failures=`expr $failures + 1`; fi # Reset the file permissions on the generated SSL config file
--- a/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -2,17 +2,17 @@ # Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. -# +# # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # version 2 for more details (a copy is included in the LICENSE file that # accompanied this code). -# +# # You should have received a copy of the GNU General Public License version # 2 along with this work; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. @@ -46,13 +46,13 @@ if [ ! -e ${_testclasses} ] then - mkdir -p ${_testclasses} - fi + mkdir -p ${_testclasses} + fi rm -f ${_testclasses}/JMXStartStopTest.class # Compile testcase - ${TESTJAVA}/bin/javac -d ${_testclasses} JMXStartStopDoSomething.java JMXStartStopTest.java + ${TESTJAVA}/bin/javac -d ${_testclasses} JMXStartStopDoSomething.java JMXStartStopTest.java if [ ! -e ${_testclasses}/JMXStartStopTest.class ] then @@ -65,10 +65,10 @@ if [ "${_verbose}" = "yes" ] then - echo "RUN: ${TESTJAVA}/bin/java -server $* -cp ${_testclasses} JMXStartStopDoSomething " - fi - ${TESTJAVA}/bin/java -server $* -cp ${_testclasses} JMXStartStopDoSomething >> ${_logname} 2>&1 & - sleep 1 + echo "RUN: ${TESTJAVA}/bin/java ${TESTVMOPTS} $* -cp ${_testclasses} JMXStartStopDoSomething " + fi + ${TESTJAVA}/bin/java ${TESTVMOPTS} $* -cp ${_testclasses} JMXStartStopDoSomething >> ${_logname} 2>&1 & + sleep 1 pid=`_get_pid` if [ "x${pid}" = "x" ] @@ -96,38 +96,38 @@ exit -1 fi } - + testme(){ - ${TESTJAVA}/bin/java -cp ${_testclasses} JMXStartStopTest $* -} + ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${_testclasses} JMXStartStopTest $* +} - + _jcmd(){ if [ "${_verbose}" = "yes" ] then echo "RUN: ${TESTJAVA}/bin/jcmd JMXStartStopDoSomething $*" - ${TESTJAVA}/bin/jcmd JMXStartStopDoSomething $* + ${TESTJAVA}/bin/jcmd JMXStartStopDoSomething $* else ${TESTJAVA}/bin/jcmd JMXStartStopDoSomething $* > /dev/null 2>/dev/null fi -} +} _echo(){ echo "$*" echo "$*" >> ${_logname} } - + # ============= TESTS ====================================== - + test_01(){ -# Run an app with JMX enabled stop it and +# Run an app with JMX enabled stop it and # restart on other port - - _echo "**** Test one ****" + + _echo "**** Test one ****" _app_start -Dcom.sun.management.jmxremote.port=$1 \ -Dcom.sun.management.jmxremote.authenticate=false \ - -Dcom.sun.management.jmxremote.ssl=false + -Dcom.sun.management.jmxremote.ssl=false res1=`testme $1` @@ -140,30 +140,30 @@ res3=`testme $2` - if [ "${res1}" = "OK_CONN" -a "${res2}" = "NO_CONN" -a "${res3}" = "OK_CONN" ] + if [ "${res1}" = "OK_CONN" -a "${res2}" = "NO_CONN" -a "${res3}" = "OK_CONN" ] then - _echo "Passed" + _echo "Passed" else - _echo "Failed r1(OK):${res1} r2(NO):${res2} r3(OK):${res3}" + _echo "Failed r1(OK):${res1} r2(NO):${res2} r3(OK):${res3}" _app_stop "Failed" fi _app_stop -} - +} + test_02(){ -# Run an app without JMX enabled +# Run an app without JMX enabled # start JMX by jcmd -_echo "**** Test two ****" -_app_start +_echo "**** Test two ****" +_app_start -_jcmd ManagementAgent.start jmxremote.port=$1 jmxremote.authenticate=false jmxremote.ssl=false +_jcmd ManagementAgent.start jmxremote.port=$1 jmxremote.authenticate=false jmxremote.ssl=false res1=`testme $1` -if [ "${res1}" = "OK_CONN" ] +if [ "${res1}" = "OK_CONN" ] then _echo "Passed" else @@ -173,16 +173,16 @@ _app_stop -} - +} + test_03(){ -# Run an app without JMX enabled +# Run an app without JMX enabled # start JMX by jcmd on one port than on other one -_echo "**** Test three ****" -_app_start +_echo "**** Test three ****" +_app_start -_jcmd ManagementAgent.start jmxremote.port=$1 jmxremote.authenticate=false jmxremote.ssl=false +_jcmd ManagementAgent.start jmxremote.port=$1 jmxremote.authenticate=false jmxremote.ssl=false # Second agent shouldn't start _jcmd ManagementAgent.start jmxremote.port=$2 jmxremote.authenticate=false jmxremote.ssl=false @@ -190,7 +190,7 @@ # First agent should connect res1=`testme $1` -if [ "${res1}" = "OK_CONN" ] +if [ "${res1}" = "OK_CONN" ] then _echo "Passed $1" else @@ -201,7 +201,7 @@ #Second agent shouldn't connect res1=`testme $2` -if [ "${res1}" = "NO_CONN" ] +if [ "${res1}" = "NO_CONN" ] then _echo "Passed $2" else @@ -209,21 +209,21 @@ fi _app_stop -} - +} + test_04(){ -# Run an app without JMX enabled +# Run an app without JMX enabled # start JMX by jcmd on one port, specify rmi port explicitly -_echo "**** Test four ****" -_app_start +_echo "**** Test four ****" +_app_start -_jcmd ManagementAgent.start jmxremote.port=$1 jmxremote.rmi.port=$2 jmxremote.authenticate=false jmxremote.ssl=false +_jcmd ManagementAgent.start jmxremote.port=$1 jmxremote.rmi.port=$2 jmxremote.authenticate=false jmxremote.ssl=false # First agent should connect res1=`testme $1 $2` -if [ "${res1}" = "OK_CONN" ] +if [ "${res1}" = "OK_CONN" ] then _echo "Passed $1 $2" else @@ -232,21 +232,21 @@ fi _app_stop -} +} test_05(){ # Run an app without JMX enabled, it will enable local server -# but should leave remote server disabled +# but should leave remote server disabled -_echo "**** Test five ****" -_app_start +_echo "**** Test five ****" +_app_start -_jcmd ManagementAgent.start jmxremote=1 +_jcmd ManagementAgent.start jmxremote=1 # First agent should connect res1=`testme $1` -if [ "${res1}" = "NO_CONN" ] +if [ "${res1}" = "NO_CONN" ] then _echo "Passed $1 $2" else @@ -255,26 +255,26 @@ fi _app_stop -} +} test_06(){ -# Run an app without JMX enabled +# Run an app without JMX enabled # start JMX by jcmd on one port, specify rmi port explicitly # attempt to start it again -# 1) with the same port +# 1) with the same port # 2) with other port # 3) attempt to stop it twice -# Check for valid messages in the output +# Check for valid messages in the output -_echo "**** Test six ****" -_app_start +_echo "**** Test six ****" +_app_start -_jcmd ManagementAgent.start jmxremote.port=$1 jmxremote.authenticate=false jmxremote.ssl=false +_jcmd ManagementAgent.start jmxremote.port=$1 jmxremote.authenticate=false jmxremote.ssl=false # First agent should connect res1=`testme $1 $2` -if [ "${res1}" = "OK_CONN" ] +if [ "${res1}" = "OK_CONN" ] then _echo "Passed $1 $2" else @@ -282,28 +282,28 @@ _app_stop "Failed" fi -_jcmd ManagementAgent.start jmxremote.port=$1 jmxremote.authenticate=false jmxremote.ssl=false +_jcmd ManagementAgent.start jmxremote.port=$1 jmxremote.authenticate=false jmxremote.ssl=false -_jcmd ManagementAgent.start jmxremote.port=$2 jmxremote.authenticate=false jmxremote.ssl=false +_jcmd ManagementAgent.start jmxremote.port=$2 jmxremote.authenticate=false jmxremote.ssl=false _jcmd ManagementAgent.stop _jcmd ManagementAgent.stop -_jcmd ManagementAgent.start jmxremote.port=22 jmxremote.rmi.port=$2 jmxremote.authenticate=false jmxremote.ssl=false +_jcmd ManagementAgent.start jmxremote.port=22 jmxremote.rmi.port=$2 jmxremote.authenticate=false jmxremote.ssl=false _app_stop -} +} test_07(){ -# Run an app without JMX enabled, but with some properties set +# Run an app without JMX enabled, but with some properties set # in command line. -# make sure these properties overriden corectly +# make sure these properties overriden corectly -_echo "**** Test seven ****" +_echo "**** Test seven ****" _app_start -Dcom.sun.management.jmxremote.authenticate=false \ - -Dcom.sun.management.jmxremote.ssl=true + -Dcom.sun.management.jmxremote.ssl=true res1=`testme $1` @@ -312,28 +312,28 @@ res2=`testme $2` -if [ "${res1}" = "NO_CONN" -a "${res2}" = "OK_CONN" ] +if [ "${res1}" = "NO_CONN" -a "${res2}" = "OK_CONN" ] then echo "Passed" else - _echo "Failed r1(NO):${res1} r2(OK):${res2}" + _echo "Failed r1(NO):${res1} r2(OK):${res2}" _app_stop "Failed" fi _app_stop -} +} test_08(){ -# Run an app with JMX enabled and with some properties set +# Run an app with JMX enabled and with some properties set # in command line. # stop JMX agent and then start it again with different property values -# make sure these properties overriden corectly +# make sure these properties overriden corectly -_echo "**** Test eight ****" +_echo "**** Test eight ****" _app_start -Dcom.sun.management.jmxremote.port=$1 \ - -Dcom.sun.management.jmxremote.authenticate=false \ - -Dcom.sun.management.jmxremote.ssl=true + -Dcom.sun.management.jmxremote.authenticate=false \ + -Dcom.sun.management.jmxremote.ssl=true res1=`testme $1` @@ -346,29 +346,29 @@ res3=`testme $2` -if [ "${res1}" = "NO_CONN" -a "${res2}" = "NO_CONN" -a "${res3}" = "OK_CONN" ] +if [ "${res1}" = "NO_CONN" -a "${res2}" = "NO_CONN" -a "${res3}" = "OK_CONN" ] then _echo "Passed" else _echo "Failed r1(NO):${res1} r2(NO):${res2} r3(OK):${res3}" _app_stop "Failed" fi - + _app_stop -} +} test_09(){ -# Run an app with JMX enabled and with some properties set +# Run an app with JMX enabled and with some properties set # in command line. # stop JMX agent and then start it again with different property values # specifing some property in management config file and some of them # in command line -# make sure these properties overriden corectly +# make sure these properties overriden corectly -_echo "**** Test nine ****" +_echo "**** Test nine ****" _app_start -Dcom.sun.management.config.file=${_testsrc}/management_cl.properties \ - -Dcom.sun.management.jmxremote.authenticate=false + -Dcom.sun.management.jmxremote.authenticate=false res1=`testme $1` @@ -381,29 +381,29 @@ res3=`testme $2` -if [ "${res1}" = "NO_CONN" -a "${res2}" = "NO_CONN" -a "${res3}" = "OK_CONN" ] +if [ "${res1}" = "NO_CONN" -a "${res2}" = "NO_CONN" -a "${res3}" = "OK_CONN" ] then _echo "Passed" else _echo "Failed r1(NO):${res1} r2(NO):${res2} r3(OK):${res3}" _app_stop "Failed" fi - + _app_stop -} +} test_10(){ -# Run an app with JMX enabled and with some properties set +# Run an app with JMX enabled and with some properties set # in command line. # stop JMX agent and then start it again with different property values # stop JMX agent again and then start it without property value -# make sure these properties overriden corectly +# make sure these properties overriden corectly -_echo "**** Test ten ****" +_echo "**** Test ten ****" _app_start -Dcom.sun.management.jmxremote.port=$1 \ - -Dcom.sun.management.jmxremote.authenticate=false \ - -Dcom.sun.management.jmxremote.ssl=true + -Dcom.sun.management.jmxremote.authenticate=false \ + -Dcom.sun.management.jmxremote.ssl=true res1=`testme $1` @@ -418,28 +418,28 @@ res3=`testme $1` -if [ "${res1}" = "NO_CONN" -a "${res2}" = "OK_CONN" -a "${res3}" = "NO_CONN" ] +if [ "${res1}" = "NO_CONN" -a "${res2}" = "OK_CONN" -a "${res3}" = "NO_CONN" ] then _echo "Passed" else _echo "Failed r1(NO):${res1} r2(OK):${res2} r3(NO):${res3}" _app_stop "Failed" fi - + _app_stop -} +} test_11(){ -# Run an app with JMX enabled -# stop remote agent +# Run an app with JMX enabled +# stop remote agent # make sure local agent is not affected -_echo "**** Test eleven ****" +_echo "**** Test eleven ****" _app_start -Dcom.sun.management.jmxremote.port=$2 \ - -Dcom.sun.management.jmxremote.authenticate=false \ - -Dcom.sun.management.jmxremote.ssl=false - + -Dcom.sun.management.jmxremote.authenticate=false \ + -Dcom.sun.management.jmxremote.ssl=false + res1=`testme $2` _jcmd ManagementAgent.stop @@ -447,25 +447,25 @@ pid=`${TESTJAVA}/bin/jps | sed -n "/JMXStartStopDoSomething/s/ .*//p"` res2=`testme local ${pid}` -if [ "${res1}" = "OK_CONN" -a "${res2}" = "OK_CONN" ] +if [ "${res1}" = "OK_CONN" -a "${res2}" = "OK_CONN" ] then _echo "Passed" else _echo "Failed r1(OK):${res1} r2(OK):${res2}" _app_stop "Failed" fi - + _app_stop -} +} test_12(){ -# Run an app with JMX disabled +# Run an app with JMX disabled # start local agent only -_echo "**** Test twelve ****" +_echo "**** Test twelve ****" -_app_start - +_app_start + res1=`testme $1` _jcmd ManagementAgent.start_local @@ -478,21 +478,21 @@ res2=`testme local ${pid}` fi -if [ "${res1}" = "NO_CONN" -a "${res2}" = "OK_CONN" ] +if [ "${res1}" = "NO_CONN" -a "${res2}" = "OK_CONN" ] then _echo "Passed" else _echo "Failed r1(NO):${res1} r2(OK):${res2}" _app_stop "Failed" fi - + _app_stop -} +} test_13(){ # Run an app with -javaagent make sure it works as expected - system properties are ignored -_echo "**** Test 13 ****" +_echo "**** Test 13 ****" AGENT="${TESTJAVA}/jre/lib/management-agent.jar" if [ ! -f ${AGENT} ] @@ -500,36 +500,36 @@ AGENT="${TESTJAVA}/lib/management-agent.jar" fi -_app_start -javaagent:${AGENT}=com.sun.management.jmxremote.port=$1,com.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false - +_app_start -javaagent:${AGENT}=com.sun.management.jmxremote.port=$1,com.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false + res1=`testme $1` -if [ "${res1}" = "NO_CONN" ] +if [ "${res1}" = "NO_CONN" ] then _echo "Passed" else _echo "Failed r1(NO):${res1}" _app_stop "Failed" fi - + _app_stop -} +} #============== Server tests ======================= server_test_01(){ - - _echo "**** Server test one ****" + + _echo "**** Server test one ****" _app_start -Dcom.sun.management.jmxremote.port=$1 \ -Dcom.sun.management.jmxremote.rmi.port=$2 \ -Dcom.sun.management.jmxremote.authenticate=false \ - -Dcom.sun.management.jmxremote.ssl=false + -Dcom.sun.management.jmxremote.ssl=false -} +} - + # ============= MAIN ======================================= if [ "x${TESTJAVA}" = "x" ] @@ -551,9 +551,9 @@ #------------------------------------------------------------------------------ -# reading parameters +# reading parameters -for parm in "$@" +for parm in "$@" do case $parm in --verbose) _verbose=yes ;; @@ -563,11 +563,11 @@ --testsuite=*) _testsuite=`_echo $parm | sed "s,^--.*=\(.*\),\1,"` ;; --port-one=*) _port_one=`_echo $parm | sed "s,^--.*=\(.*\),\1,"` ;; --port-two=*) _port_two=`_echo $parm | sed "s,^--.*=\(.*\),\1,"` ;; - *) - echo "Undefined parameter $parm. Try --help for help" - exit + *) + echo "Undefined parameter $parm. Try --help for help" + exit ;; - esac + esac done if [ ${_compile} = "yes" ] @@ -588,7 +588,7 @@ # All of them require manual cleanup if [ "x${_server}" = "xyes" ] then - + server_test_01 ${_port_one} ${_port_two} else @@ -600,4 +600,3 @@ done fi -
--- a/test/sun/misc/Cleaner/exitOnThrow.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/misc/Cleaner/exitOnThrow.sh Tue Oct 18 00:18:15 2016 +0100 @@ -39,7 +39,7 @@ TESTCLASSES=`pwd` fi -if $TESTJAVA/bin/java -cp $TESTCLASSES ExitOnThrow; then +if $TESTJAVA/bin/java ${TESTVMOPTS} -cp $TESTCLASSES ExitOnThrow; then echo Failed: VM exited normally exit 1 else
--- a/test/sun/net/InetAddress/nameservice/dns/cname.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/net/InetAddress/nameservice/dns/cname.sh Tue Oct 18 00:18:15 2016 +0100 @@ -42,7 +42,7 @@ export CLASSPATH JAVA="${TESTJAVA}/bin/java" -sh -xc "$JAVA CanonicalName $HOST" 2>&1 +sh -xc "$JAVA ${TESTVMOPTS} 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 $1 Lookup $2" 2>&1 + sh -xc "$JAVA ${TESTVMOPTS} $1 Lookup $2" 2>&1 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi }
--- a/test/sun/net/sdp/sanity.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/net/sdp/sanity.sh Tue Oct 18 00:18:15 2016 +0100 @@ -57,7 +57,7 @@ export CLASSPATH # Probe for IP addresses plumbed to IB interfaces -$JAVA -Djava.net.preferIPv4Stack=true ProbeIB ${IB_LINKS} > ${IB_ADDRS} +$JAVA ${TESTVMOPTS} -Djava.net.preferIPv4Stack=true ProbeIB ${IB_LINKS} > ${IB_ADDRS} # Create sdp.conf SDPCONF=sdp.conf @@ -70,4 +70,4 @@ done # Sanity check -$JAVA -Djava.net.preferIPv4Stack=true -Dcom.sun.sdp.conf=${SDPCONF} -Dcom.sun.sdp.debug Sanity +$JAVA ${TESTVMOPTS} -Djava.net.preferIPv4Stack=true -Dcom.sun.sdp.conf=${SDPCONF} -Dcom.sun.sdp.debug Sanity
--- a/test/sun/net/www/MarkResetTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/net/www/MarkResetTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -52,4 +52,4 @@ # in this directory cp ${TESTSRC}${FS}EncDec.doc . -${TESTJAVA}${FS}bin${FS}java MarkResetTest +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} MarkResetTest
--- a/test/sun/net/www/http/HttpClient/RetryPost.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/net/www/http/HttpClient/RetryPost.sh Tue Oct 18 00:18:15 2016 +0100 @@ -50,14 +50,14 @@ ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}RetryPost.java # run with no option specified. Should retry POST request. -${TESTJAVA}${FS}bin${FS}java RetryPost +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} RetryPost result=$? if [ "$result" -ne "0" ]; then exit 1 fi # run with option specified. Should not retry POST request. -${TESTJAVA}${FS}bin${FS}java -Dsun.net.http.retryPost=false RetryPost noRetry +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Dsun.net.http.retryPost=false RetryPost noRetry result=$? if [ "$result" -ne "0" ]; then exit 1
--- a/test/sun/net/www/protocol/file/DirPermissionDenied.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/net/www/protocol/file/DirPermissionDenied.sh Tue Oct 18 00:18:15 2016 +0100 @@ -35,7 +35,7 @@ mkdir -p ${TESTDIR} chmod 333 ${TESTDIR} -$TESTJAVA/bin/java -classpath $TESTCLASSES DirPermissionDenied ${TESTDIR} +$TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES DirPermissionDenied ${TESTDIR} result=$? rm -rf ${TESTDIR} exit $result
--- a/test/sun/net/www/protocol/jar/B5105410.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/net/www/protocol/jar/B5105410.sh Tue Oct 18 00:18:15 2016 +0100 @@ -51,5 +51,5 @@ cp ${TESTSRC}${FS}foo2.jar . ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}B5105410.java -${TESTJAVA}${FS}bin${FS}java B5105410 +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} B5105410
--- a/test/sun/net/www/protocol/jar/getcontenttype.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/net/www/protocol/jar/getcontenttype.sh Tue Oct 18 00:18:15 2016 +0100 @@ -33,5 +33,5 @@ if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi # now start the test -${TESTJAVA}/bin/java -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetContentType +${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.ext.dirs=$TESTSRC -cp $TESTCLASSES GetContentType
--- a/test/sun/net/www/protocol/jar/jarbug/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/net/www/protocol/jar/jarbug/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -75,7 +75,7 @@ # ${TESTJAVA}${FS}bin${FS}javac -d ${DEST} ${TESTSRC}${FS}src${FS}test${FS}*.java cd ${DEST} -${TESTJAVA}${FS}bin${FS}java RunAllTests +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} RunAllTests result=$? if [ "$result" -ne "0" ]; then exit 1
--- a/test/sun/rmi/rmic/manifestClassPath/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/rmi/rmic/manifestClassPath/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -114,26 +114,26 @@ Success "$javac" -classpath "jars/A.jar" Main.java MainI.java Success "$rmic" -classpath "jars/A.jar${PS}." Main -Success "$java" -classpath "jars/A.jar${PS}." Main +Success "$java" ${TESTVMOPTS} -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 "$rmic" -classpath "jars/sub/B.zip${PS}." Main -Success "$java" -classpath "jars/sub/B.zip${PS}." Main +Success "$java" ${TESTVMOPTS} -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 "$rmic" -extdirs "jars" -classpath . Main -Success "$java" -Djava.ext.dirs="jars" -cp . Main +Success "$java" ${TESTVMOPTS} -Djava.ext.dirs="jars" -cp . Main Sys rm -f Main_Stub.class #Success "$javac" -extdirs "jars/sub" -classpath None Main.java MainI.java Success "$rmic" -extdirs "jars/sub" -classpath . Main -Success "$java" -Djava.ext.dirs="jars/sub" -cp . Main +Success "$java" ${TESTVMOPTS} -Djava.ext.dirs="jars/sub" -cp . Main Cleanup
--- a/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh Tue Oct 18 00:18:15 2016 +0100 @@ -41,13 +41,13 @@ set -ex ${TESTJAVA}/bin/rmic -classpath ${TESTCLASSES:-.} -d ${TESTCLASSES:-.} PImpl -${TESTJAVA}/bin/java -classpath ${TESTCLASSES:-.} Test +${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES:-.} Test ${TESTJAVA}/bin/rmic -classpath ${TESTCLASSES:-.} -d ${TESTCLASSES:-.} -vcompat PImpl -${TESTJAVA}/bin/java -classpath ${TESTCLASSES:-.} Test +${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES:-.} Test ${TESTJAVA}/bin/rmic -Xnew -classpath ${TESTCLASSES:-.} -d ${TESTCLASSES:-.} PImpl -${TESTJAVA}/bin/java -classpath ${TESTCLASSES:-.} Test +${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES:-.} Test ${TESTJAVA}/bin/rmic -Xnew -classpath ${TESTCLASSES:-.} -d ${TESTCLASSES:-.} -vcompat PImpl -${TESTJAVA}/bin/java -classpath ${TESTCLASSES:-.} Test +${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTCLASSES:-.} Test
--- a/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh Tue Oct 18 00:18:15 2016 +0100 @@ -37,7 +37,7 @@ set -x -${TESTJAVA}/bin/java -classpath ${TESTJAVA}/lib/tools.jar sun.tools.javac.Main -d ${TESTCLASSES:-.} ${TESTSRC:-.}/Foo.java +${TESTJAVA}/bin/java ${TESTVMOPTS} -classpath ${TESTJAVA}/lib/tools.jar sun.tools.javac.Main -d ${TESTCLASSES:-.} ${TESTSRC:-.}/Foo.java result=$? if [ $result -eq 0 ]
--- a/test/sun/security/krb5/runNameEquals.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/krb5/runNameEquals.sh Tue Oct 18 00:18:15 2016 +0100 @@ -85,7 +85,7 @@ if [ "${NATIVE}" = "true" ] ; then echo "Testing native provider" - ${TESTJAVA}${FILESEP}bin${FILESEP}java \ + ${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \ -classpath ${TESTCLASSES} \ -Dsun.security.jgss.native=true \ ${TEST} @@ -96,7 +96,7 @@ fi echo "Testing java provider" -${TESTJAVA}${FILESEP}bin${FILESEP}java \ +${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \ -classpath ${TESTCLASSES} \ -Djava.security.krb5.realm=R \ -Djava.security.krb5.kdc=127.0.0.1 \
--- a/test/sun/security/krb5/tools/ktcheck.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/krb5/tools/ktcheck.sh Tue Oct 18 00:18:15 2016 +0100 @@ -58,7 +58,7 @@ 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 ${EXTRA_OPTIONS} KtabCheck $KEYTAB" +CHECK="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${EXTRA_OPTIONS} KtabCheck $KEYTAB" echo ${EXTRA_OPTIONS}
--- a/test/sun/security/mscapi/AccessKeyStore.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/mscapi/AccessKeyStore.sh Tue Oct 18 00:18:15 2016 +0100 @@ -43,13 +43,13 @@ ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\AccessKeyStore.java echo "Using access.policy..." - ${TESTJAVA}/bin/java \ + ${TESTJAVA}/bin/java ${TESTVMOPTS} \ -Djava.security.manager \ -Djava.security.policy==${TESTSRC}\\access.policy \ AccessKeyStore echo "Using noaccess.policy..." - ${TESTJAVA}/bin/java \ + ${TESTJAVA}/bin/java ${TESTVMOPTS} \ -Djava.security.manager \ -Djava.security.policy==${TESTSRC}\\noaccess.policy \ AccessKeyStore -deny
--- a/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh Tue Oct 18 00:18:15 2016 +0100 @@ -41,7 +41,7 @@ # execute test program - rely on it to exit if platform unsupported ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\IsSunMSCAPIAvailable.java - ${TESTJAVA}/bin/java IsSunMSCAPIAvailable + ${TESTJAVA}/bin/java ${TESTVMOPTS} IsSunMSCAPIAvailable exit ;;
--- a/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh Tue Oct 18 00:18:15 2016 +0100 @@ -43,15 +43,15 @@ ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\KeyStoreCompatibilityMode.java # mode implicitly enabled - ${TESTJAVA}/bin/java KeyStoreCompatibilityMode + ${TESTJAVA}/bin/java ${TESTVMOPTS} KeyStoreCompatibilityMode # mode explicitly enabled - ${TESTJAVA}/bin/java \ + ${TESTJAVA}/bin/java ${TESTVMOPTS} \ -Dsun.security.mscapi.keyStoreCompatibilityMode="true" \ KeyStoreCompatibilityMode # mode explicitly disabled - ${TESTJAVA}/bin/java \ + ${TESTJAVA}/bin/java ${TESTVMOPTS} \ -Dsun.security.mscapi.keyStoreCompatibilityMode="false" \ KeyStoreCompatibilityMode -disable
--- a/test/sun/security/mscapi/PublicKeyInterop.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/mscapi/PublicKeyInterop.sh Tue Oct 18 00:18:15 2016 +0100 @@ -63,7 +63,7 @@ echo echo "Running the test..." ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\PublicKeyInterop.java - ${TESTJAVA}/bin/java PublicKeyInterop + ${TESTJAVA}/bin/java ${TESTVMOPTS} PublicKeyInterop rc=$?
--- a/test/sun/security/mscapi/RSAEncryptDecrypt.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/mscapi/RSAEncryptDecrypt.sh Tue Oct 18 00:18:15 2016 +0100 @@ -71,7 +71,7 @@ # unsupported ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\RSAEncryptDecrypt.java - ${TESTJAVA}/bin/java RSAEncryptDecrypt + ${TESTJAVA}/bin/java ${TESTVMOPTS} RSAEncryptDecrypt exit ;;
--- a/test/sun/security/mscapi/ShortRSAKey1024.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/mscapi/ShortRSAKey1024.sh Tue Oct 18 00:18:15 2016 +0100 @@ -80,7 +80,7 @@ echo echo "Running the test..." ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\ShortRSAKeyWithinTLS.java - ${TESTJAVA}/bin/java ShortRSAKeyWithinTLS 7106773.$BITS $BITS \ + ${TESTJAVA}/bin/java ${TESTVMOPTS} ShortRSAKeyWithinTLS 7106773.$BITS $BITS \ TLSv1.2 TLS_DHE_RSA_WITH_AES_128_CBC_SHA rc=$?
--- a/test/sun/security/mscapi/SignUsingNONEwithRSA.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/mscapi/SignUsingNONEwithRSA.sh Tue Oct 18 00:18:15 2016 +0100 @@ -62,7 +62,7 @@ echo echo "Running the test..." ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingNONEwithRSA.java - ${TESTJAVA}/bin/java SignUsingNONEwithRSA + ${TESTJAVA}/bin/java ${TESTVMOPTS} SignUsingNONEwithRSA rc=$?
--- a/test/sun/security/mscapi/SignUsingSHA2withRSA.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/mscapi/SignUsingSHA2withRSA.sh Tue Oct 18 00:18:15 2016 +0100 @@ -62,7 +62,7 @@ echo echo "Running the test..." ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingSHA2withRSA.java - ${TESTJAVA}/bin/java SignUsingSHA2withRSA + ${TESTJAVA}/bin/java ${TESTVMOPTS} SignUsingSHA2withRSA rc=$?
--- a/test/sun/security/pkcs11/KeyStore/Basic.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/pkcs11/KeyStore/Basic.sh Tue Oct 18 00:18:15 2016 +0100 @@ -171,7 +171,7 @@ # run test -${TESTJAVA}${FS}bin${FS}java \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \ -classpath ${TESTCLASSES}${PS}${TESTSRC}${FS}loader.jar \ -DDIR=${TESTSRC}${FS}BasicData \ -DCUSTOM_DB_DIR=${TESTCLASSES} \
--- a/test/sun/security/pkcs11/KeyStore/ClientAuth.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/pkcs11/KeyStore/ClientAuth.sh Tue Oct 18 00:18:15 2016 +0100 @@ -128,7 +128,7 @@ # run test echo "Run ClientAuth ..." -${TESTJAVA}${FS}bin${FS}java \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \ -classpath ${TESTCLASSES}${PS}${TESTSRC}${FS}loader.jar \ -DDIR=${TESTSRC}${FS}ClientAuthData${FS} \ -DCUSTOM_DB_DIR=${TESTCLASSES} \ @@ -149,7 +149,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 \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \ -classpath ${TESTCLASSES}${PS}${TESTSRC}${FS}loader.jar \ -DDIR=${TESTSRC}${FS}ClientAuthData${FS} \ -DCUSTOM_DB_DIR=${TESTCLASSES} \
--- a/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh Tue Oct 18 00:18:15 2016 +0100 @@ -141,7 +141,7 @@ # run test cd ${TESTSRC} -${TESTJAVA}${FS}bin${FS}java \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \ -DDIR=${TESTSRC}${FS}BasicData${FS} \ -classpath ${TESTCLASSES}${PS}${TESTSRC}${FS}loader.jar \ -DCUSTOM_DB_DIR=${TESTCLASSES} \
--- a/test/sun/security/pkcs11/KeyStore/Solaris.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/pkcs11/KeyStore/Solaris.sh Tue Oct 18 00:18:15 2016 +0100 @@ -142,7 +142,7 @@ # run test cd ${TESTSRC} -${TESTJAVA}${FS}bin${FS}java \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \ -classpath ${TESTCLASSES}${PS}${TESTSRC}${FS}loader.jar \ -DDIR=${TESTSRC}${FS}BasicData${FS} \ -DCUSTOM_P11_CONFIG=${TESTSRC}${FS}BasicData${FS}p11-solaris.txt \
--- a/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Tue Oct 18 00:18:15 2016 +0100 @@ -105,7 +105,7 @@ # run test -${TESTJAVA}${FS}bin${FS}java \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \ -classpath ${TESTCLASSES} \ -DCUSTOM_P11_CONFIG=${TESTSRC}${FS}ConfigQuotedString-nss.txt \ -Dtest.src=${TESTSRC} \
--- a/test/sun/security/pkcs11/Provider/Login.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/pkcs11/Provider/Login.sh Tue Oct 18 00:18:15 2016 +0100 @@ -114,7 +114,7 @@ # run test -${TESTJAVA}${FS}bin${FS}java \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \ -classpath ${TESTCLASSES} \ -DCUSTOM_DB_DIR=${TESTCLASSES} \ -DCUSTOM_P11_CONFIG=${TESTSRC}${FS}Login-nss.txt \
--- a/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Tue Oct 18 00:18:15 2016 +0100 @@ -82,7 +82,7 @@ ${TESTJAVA}${FILESEP}jre${FILESEP}lib${FILESEP}security${FILESEP}tmp_pol # run the test program -${TESTJAVA}${FILESEP}bin${FILESEP}java -Djava.security.manager \ +${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} -Djava.security.manager \ GrantAllPermToExtWhenNoPolicy # save error status
--- a/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Tue Oct 18 00:18:15 2016 +0100 @@ -96,7 +96,7 @@ ${TESTJAVA}${FS}bin${FS}javac -d ${TESTCLASSES}${FS}app \ ${TESTSRC}${FS}GetInstance.java -${TESTJAVA}${FS}bin${FS}java \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \ -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 \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} \ -classpath "${TESTCLASSES}${FS}boot${PS}${TESTCLASSES}${FS}app" \ -Djava.security.manager \ -Djava.security.policy=GetInstance.policy \
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Tue Oct 18 00:18:15 2016 +0100 @@ -59,7 +59,7 @@ echo "${STRING}" echo "=========" -${TESTJAVA}${FS}bin${FS}java -Djavax.net.debug=all \ +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Djavax.net.debug=all \ -Dtest.src=${TESTSRC} \ DebugReportsOneExtraByte 2>&1 | \ grep "${STRING}"
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -82,7 +82,7 @@ # This is the only thing we really care about as far as # test status goes. # -${TESTJAVA}${FILESEP}bin${FILESEP}java \ +${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \ -Dtest.src=${TESTSRC} \ -classpath "com.jar${PATHSEP}edu.jar" \ -Djava.security.manager \
--- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Tue Oct 18 00:18:15 2016 +0100 @@ -52,5 +52,5 @@ ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}OriginServer.java \ ${TESTSRC}${FS}ProxyTunnelServer.java ${TESTSRC}${FS}PostThruProxy.java -${TESTJAVA}${FS}bin${FS}java PostThruProxy ${HOSTNAME} ${TESTSRC} +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} PostThruProxy ${HOSTNAME} ${TESTSRC} exit
--- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Tue Oct 18 00:18:15 2016 +0100 @@ -53,5 +53,5 @@ ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}OriginServer.java \ ${TESTSRC}${FS}ProxyTunnelServer.java \ ${TESTSRC}${FS}PostThruProxyWithAuth.java -${TESTJAVA}${FS}bin${FS}java PostThruProxyWithAuth ${HOSTNAME} ${TESTSRC} +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} PostThruProxyWithAuth ${HOSTNAME} ${TESTSRC} exit
--- a/test/sun/security/tools/jarsigner/emptymanifest.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/tools/jarsigner/emptymanifest.sh Tue Oct 18 00:18:15 2016 +0100 @@ -65,7 +65,7 @@ } EOF $JAVAC CrLf.java -$JAVA CrLf > META-INF${FS}MANIFEST.MF +$JAVA ${TESTVMOPTS} 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
--- a/test/sun/security/tools/jarsigner/ts.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/tools/jarsigner/ts.sh Tue Oct 18 00:18:15 2016 +0100 @@ -87,5 +87,5 @@ $KT -alias tsbad3 -importcert $JAVAC -XDignore.symbol.file -d . ${TESTSRC}/TimestampCheck.java -$JAVA TimestampCheck +$JAVA ${TESTVMOPTS} TimestampCheck
--- a/test/sun/security/tools/keytool/printssl.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/tools/keytool/printssl.sh Tue Oct 18 00:18:15 2016 +0100 @@ -53,7 +53,7 @@ esac ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}PrintSSL.java || exit 10 -${TESTJAVA}${FS}bin${FS}java -Dtest.src=$TESTSRC PrintSSL | ( read PORT; ${TESTJAVA}${FS}bin${FS}keytool -printcert -sslserver localhost:$PORT ) +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Dtest.src=$TESTSRC PrintSSL | ( read PORT; ${TESTJAVA}${FS}bin${FS}keytool -printcert -sslserver localhost:$PORT ) status=$? rm PrintSSL*.class
--- a/test/sun/security/tools/keytool/standard.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/tools/keytool/standard.sh Tue Oct 18 00:18:15 2016 +0100 @@ -58,7 +58,7 @@ ${TESTJAVA}${FS}bin${FS}javac -d . -XDignore.symbol.file ${TESTSRC}${FS}KeyToolTest.java || exit 10 -echo | ${TESTJAVA}${FS}bin${FS}java -Dfile KeyToolTest +echo | ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -Dfile KeyToolTest status=$? rm HumanInputStream*.class
--- a/test/sun/security/validator/certreplace.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/validator/certreplace.sh Tue Oct 18 00:18:15 2016 +0100 @@ -82,4 +82,4 @@ # 5. Build and run test $JAVAC -d . ${TESTSRC}${FS}CertReplace.java -$JAVA CertReplace certreplace.jks certreplace.certs +$JAVA ${TESTVMOPTS} CertReplace certreplace.jks certreplace.certs
--- a/test/sun/security/validator/samedn.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/sun/security/validator/samedn.sh Tue Oct 18 00:18:15 2016 +0100 @@ -78,5 +78,5 @@ # Check both, one of them might be dropped out of map in old codes. $JAVAC -d . ${TESTSRC}${FS}CertReplace.java -$JAVA CertReplace samedn.jks samedn1.certs || exit 1 -$JAVA CertReplace samedn.jks samedn2.certs || exit 2 +$JAVA ${TESTVMOPTS} CertReplace samedn.jks samedn1.certs || exit 1 +$JAVA ${TESTVMOPTS} CertReplace samedn.jks samedn2.certs || exit 2
--- a/test/tools/launcher/6842838/Test6842838.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/tools/launcher/6842838/Test6842838.sh Tue Oct 18 00:18:15 2016 +0100 @@ -68,8 +68,8 @@ fi BADFILE=newbadjar.jar -${JAVA_EXE} -version -${JAVA_EXE} -cp ${TESTCLASSES} CreateBadJar ${BADFILE} "META-INF/MANIFEST.MF" +${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 grep "Invalid or corrupt jarfile" test.out
--- a/test/tools/launcher/MultipleJRE.sh Mon Oct 17 23:40:23 2016 +0100 +++ b/test/tools/launcher/MultipleJRE.sh Tue Oct 18 00:18:15 2016 +0100 @@ -49,8 +49,8 @@ exit 1 fi -JAVAEXE="$TESTJAVA/bin/java" -JAVA="$TESTJAVA/bin/java -classpath $TESTCLASSES" +JAVAEXE="$TESTJAVA/bin/java ${TESTVMOPTS}" +JAVA="$TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES" JAR="$TESTJAVA/bin/jar" OS=`uname -s`;