8003890: corelibs test scripts should pass TESTVMOPTS
Reviewed-by: chegar, alanb
Contributed-by: Mark Sheppard <mark.sheppard@oracle.com>
--- a/jdk/test/com/oracle/net/sanity.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/com/oracle/net/sanity.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/com/sun/corba/cachedSocket/7056731.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/com/sun/corba/cachedSocket/7056731.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/com/sun/tools/attach/ApplicationSetup.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/com/sun/tools/attach/ApplicationSetup.sh Thu Dec 13 14:47:35 2012 +0000
@@ -41,7 +41,7 @@
startApplication()
{
# put all output from the app into ${OUTPUTFILE}
- ${JAVA} $1 $2 $3 -jar "${TESTCLASSES}"/Application.jar > ${OUTPUTFILE} 2>&1 &
+ ${JAVA} ${TESTVMOPTS} $1 $2 $3 -jar "${TESTCLASSES}"/Application.jar > ${OUTPUTFILE} 2>&1 &
pid="$!"
# MKS creates an intermediate shell to launch ${JAVA} so
@@ -78,6 +78,6 @@
stopApplication()
{
- $JAVA -classpath "${TESTCLASSES}" Shutdown $1
+ $JAVA ${TESTVMOPTS} -classpath "${TESTCLASSES}" Shutdown $1
}
--- a/jdk/test/com/sun/tools/attach/BasicTests.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/com/sun/tools/attach/BasicTests.sh Thu Dec 13 14:47:35 2012 +0000
@@ -61,7 +61,7 @@
echo "Running tests ..."
-$JAVA -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \
+$JAVA ${TESTVMOPTS} -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \
BasicTests $pid $agent $badagent $redefineagent 2>&1
if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
--- a/jdk/test/com/sun/tools/attach/PermissionTests.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/com/sun/tools/attach/PermissionTests.sh Thu Dec 13 14:47:35 2012 +0000
@@ -48,7 +48,7 @@
echo "Deny test"
# deny
-$JAVA -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \
+$JAVA ${TESTVMOPTS} -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \
-Djava.security.manager \
-Djava.security.policy=${TESTSRC}/java.policy.deny \
PermissionTest $pid true 2>&1
@@ -56,7 +56,7 @@
# allow
echo "Allow test"
-$JAVA -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \
+$JAVA ${TESTVMOPTS} -classpath "${TESTCLASSES}${PS}${TESTJAVA}/lib/tools.jar" \
-Djava.security.manager \
-Djava.security.policy=${TESTSRC}/java.policy.allow \
PermissionTest $pid false 2>&1
--- a/jdk/test/com/sun/tools/attach/ProviderTests.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/com/sun/tools/attach/ProviderTests.sh Thu Dec 13 14:47:35 2012 +0000
@@ -45,7 +45,7 @@
echo "Running test ..."
-$JAVA -classpath \
+$JAVA ${TESTVMOPTS} -classpath \
"${TESTCLASSES}${PS}${TESTCLASSES}/SimpleProvider.jar${PS}${TESTJAVA}/lib/tools.jar" \
ProviderTest
--- a/jdk/test/com/sun/tools/extcheck/TestExtcheckArgs.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/com/sun/tools/extcheck/TestExtcheckArgs.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/demo/zipfs/basic.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/demo/zipfs/basic.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/File/GetXSpace.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/File/GetXSpace.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/File/MacPathTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/File/MacPathTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/File/basic.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/File/basic.sh Thu Dec 13 14:47:35 2012 +0000
@@ -44,7 +44,7 @@
;;
esac
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/jdk/test/java/io/FileOutputStream/FileOpen.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/FileOutputStream/FileOpen.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/Serializable/class/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/Serializable/class/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/Serializable/evolution/AddedExternField/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/Serializable/evolution/AddedExternField/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/Serializable/maskSyntheticModifier/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/Serializable/maskSyntheticModifier/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/Serializable/packageAccess/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/Serializable/packageAccess/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/Serializable/resolveClass/consTest/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/Serializable/resolveClass/consTest/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/Serializable/resolveClass/deserializeButton/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/Serializable/resolveClass/deserializeButton/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/Serializable/subclass/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/Serializable/subclass/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/Serializable/superclassDataLoss/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/Serializable/superclassDataLoss/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/io/Serializable/unnamedPackageSwitch/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/io/Serializable/unnamedPackageSwitch/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/lang/Class/forName/NonJavaNames.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/lang/Class/forName/NonJavaNames.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/lang/ClassLoader/Assert.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/lang/ClassLoader/Assert.sh Thu Dec 13 14:47:35 2012 +0000
@@ -49,7 +49,7 @@
${TESTJAVA}/bin/javac Assert.java
-${TESTJAVA}/bin/java Assert
+${TESTJAVA}/bin/java ${TESTVMOPTS} Assert
result=$?
if [ $result -eq 0 ]
--- a/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Thu Dec 13 14:47:35 2012 +0000
@@ -98,6 +98,7 @@
# run test
${TESTJAVA}${FS}bin${FS}java \
+ ${TESTVMOPTS} \
-verbose:class -XX:+TraceClassLoading -cp . \
-Dtest.classes=${TESTCLASSES} \
Starter cross
--- a/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Thu Dec 13 14:47:35 2012 +0000
@@ -93,6 +93,7 @@
# run test
${TESTJAVA}${FS}bin${FS}java \
+ ${TESTVMOPTS} \
-verbose:class -XX:+TraceClassLoading -cp . \
-Dtest.classes=${TESTCLASSES} \
Starter one-way
--- a/jdk/test/java/lang/ClassLoader/getdotresource.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/lang/ClassLoader/getdotresource.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/lang/Runtime/exec/setcwd.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/lang/Runtime/exec/setcwd.sh Thu Dec 13 14:47:35 2012 +0000
@@ -37,5 +37,5 @@
cp ${TESTCLASSES}/SetCwd.class foo
# now start the test
-${TESTJAVA}/bin/java SetCwd
+${TESTJAVA}/bin/java ${TESTVMOPTS} SetCwd
--- a/jdk/test/java/lang/StringCoding/CheckEncodings.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/lang/StringCoding/CheckEncodings.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/lang/System/finalization/FinExit.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/lang/System/finalization/FinExit.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/net/Authenticator/B4933582.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/Authenticator/B4933582.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/net/InetAddress/ptr/lookup.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/InetAddress/ptr/lookup.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh Thu Dec 13 14:47:35 2012 +0000
@@ -45,4 +45,4 @@
ulimit -n 1024
fi
-${TESTJAVA}/bin/java AcceptCauseFileDescriptorLeak
+${TESTJAVA}/bin/java ${TESTVMOPTS} AcceptCauseFileDescriptorLeak
--- a/jdk/test/java/net/Socket/OldSocketImpl.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/Socket/OldSocketImpl.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/net/URL/B5086147.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/URL/B5086147.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/net/URL/runconstructor.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/URL/runconstructor.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/net/URLClassLoader/B5077773.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/URLClassLoader/B5077773.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/net/URLClassLoader/getresourceasstream/test.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/URLClassLoader/getresourceasstream/test.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/net/URLConnection/6212146/test.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/URLConnection/6212146/test.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/net/URLConnection/UNCTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/net/URLConnection/UNCTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/nio/Buffer/LimitDirectMemory.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/nio/Buffer/LimitDirectMemory.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/nio/charset/Charset/default.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/nio/charset/Charset/default.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/nio/charset/spi/basic.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/nio/charset/spi/basic.sh Thu Dec 13 14:47:35 2012 +0000
@@ -116,7 +116,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/jdk/test/java/nio/file/Files/delete_on_close.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/nio/file/Files/delete_on_close.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/nio/file/Path/MacPathTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/nio/file/Path/MacPathTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/rmi/registry/readTest/readTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/rmi/registry/readTest/readTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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`
@@ -76,7 +76,7 @@
;;
esac
# trailing / after code base is important for rmi codebase property.
-${TESTJAVA}${FS}bin${FS}java -cp $TEST_CLASSPATH -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 &
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp $TEST_CLASSPATH -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/jdk/test/java/rmi/reliability/benchmark/runSerialBench.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/rmi/reliability/benchmark/runSerialBench.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Thu Dec 13 14:47:35 2012 +0000
@@ -87,7 +87,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/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Thu Dec 13 14:47:35 2012 +0000
@@ -62,5 +62,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/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Thu Dec 13 14:47:35 2012 +0000
@@ -100,8 +100,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/jdk/test/java/security/Security/signedfirst/Dyn.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/security/Security/signedfirst/Dyn.sh Thu Dec 13 14:47:35 2012 +0000
@@ -83,7 +83,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/jdk/test/java/security/Security/signedfirst/Static.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/security/Security/signedfirst/Static.sh Thu Dec 13 14:47:35 2012 +0000
@@ -84,7 +84,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/jdk/test/java/security/cert/CertificateFactory/slowstream.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/security/cert/CertificateFactory/slowstream.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/util/Currency/PropertiesTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/Currency/PropertiesTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -70,7 +70,7 @@
run() {
echo ''
- sh -xc "${TESTJAVA}${FS}bin${FS}java -cp ${TESTCLASSES} $*" 2>&1
+ sh -xc "${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} $*" 2>&1
if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
}
@@ -113,7 +113,7 @@
# run
echo ''
-sh -xc "${WRITABLEJDK}${FS}bin${FS}java -cp ${TESTCLASSES} PropertiesTest -d dump3"
+sh -xc "${WRITABLEJDK}${FS}bin${FS}java ${TESTVMOPTS} -cp ${TESTCLASSES} PropertiesTest -d dump3"
if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
# Cleanup
--- a/jdk/test/java/util/Locale/LocaleCategory.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/Locale/LocaleCategory.sh Thu Dec 13 14:47:35 2012 +0000
@@ -69,7 +69,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}
@@ -85,7 +85,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/jdk/test/java/util/Locale/LocaleProviders.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/Locale/LocaleProviders.sh Thu Dec 13 14:47:35 2012 +0000
@@ -96,12 +96,12 @@
${TESTJAVA}${FS}bin${FS}jar cvf ${SPIDIR}${FS}tznp.jar -C ${SPIDIR}${FS}dest .
# get the platform default locales
-PLATDEF=`${TESTJAVA}${FS}bin${FS}java -classpath ${TESTCLASSES} LocaleProviders getPlatformLocale display`
+PLATDEF=`${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -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 -classpath ${TESTCLASSES} LocaleProviders getPlatformLocale format`
+PLATDEF=`${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} LocaleProviders getPlatformLocale format`
DEFFMTLANG=`echo ${PLATDEF} | sed -e "s/,.*//"`
DEFFMTCTRY=`echo ${PLATDEF} | sed -e "s/.*,//"`
echo "DEFFMTLANG=${DEFFMTLANG}"
@@ -109,7 +109,7 @@
runTest()
{
- RUNCMD="${TESTJAVA}${FS}bin${FS}java -classpath ${TESTCLASSES} -Djava.locale.providers=$PREFLIST LocaleProviders $METHODNAME $PARAM1 $PARAM2 $PARAM3"
+ RUNCMD="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} -Djava.locale.providers=$PREFLIST LocaleProviders $METHODNAME $PARAM1 $PARAM2 $PARAM3"
echo ${RUNCMD}
${RUNCMD}
result=$?
--- a/jdk/test/java/util/PluggableLocale/ExecTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/PluggableLocale/ExecTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/util/ServiceLoader/basic.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/ServiceLoader/basic.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/util/TimeZone/OldIDMappingTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/TimeZone/OldIDMappingTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh Thu Dec 13 14:47:35 2012 +0000
@@ -53,6 +53,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/jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/util/prefs/PrefsSpi.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/prefs/PrefsSpi.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -21,4 +21,5 @@
# questions.
#
-${TESTJAVA}/bin/java -Djava.ext.dirs=${TESTSRC} -cp ${TESTCLASSES} UserDefaultControlTest
\ No newline at end of file
+${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.ext.dirs=${TESTSRC} -cp ${TESTCLASSES} UserDefaultControlTest
+
--- a/jdk/test/java/util/zip/3GBZipFiles.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/zip/3GBZipFiles.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/java/util/zip/ZipFile/deletetempjar.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/java/util/zip/ZipFile/deletetempjar.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/javax/print/applet/AppletPrintLookup.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/javax/print/applet/AppletPrintLookup.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/javax/script/ProviderTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/javax/script/ProviderTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -45,6 +45,6 @@
echo "Running test ..."
-$JAVA -classpath \
+$JAVA ${TESTVMOPTS} -classpath \
"${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \
ProviderTest
--- a/jdk/test/javax/security/auth/Subject/doAs/Test.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/javax/security/auth/Subject/doAs/Test.sh Thu Dec 13 14:47:35 2012 +0000
@@ -71,7 +71,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/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -61,7 +61,7 @@
}
_app_start(){
- ${TESTJAVA}/bin/java -server $* -cp ${_testclasses} JMXStartStopDoSomething >> ${_logname} 2>&1 &
+ ${TESTJAVA}/bin/java ${TESTVMOPTS} $* -cp ${_testclasses} JMXStartStopDoSomething >> ${_logname} 2>&1 &
npid=`_get_pid`
if [ "${npid}" = "" ]
@@ -103,7 +103,7 @@
}
_testme(){
- ${TESTJAVA}/bin/java -cp ${_testclasses} JMXStartStopTest $*
+ ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${_testclasses} JMXStartStopTest $*
}
--- a/jdk/test/sun/misc/Cleaner/exitOnThrow.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/misc/Cleaner/exitOnThrow.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/net/sdp/sanity.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/net/sdp/sanity.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/net/www/MarkResetTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/net/www/MarkResetTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/net/www/protocol/file/DirPermissionDenied.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/net/www/protocol/file/DirPermissionDenied.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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=$?
# Add back read access for user, otherwise not removable on some systems
--- a/jdk/test/sun/net/www/protocol/jar/B5105410.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/net/www/protocol/jar/B5105410.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/net/www/protocol/jar/getcontenttype.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/net/www/protocol/jar/getcontenttype.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -71,7 +71,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/jdk/test/sun/rmi/rmic/manifestClassPath/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/rmi/rmic/manifestClassPath/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/krb5/runNameEquals.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/krb5/runNameEquals.sh Thu Dec 13 14:47:35 2012 +0000
@@ -81,7 +81,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}
@@ -92,7 +92,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/jdk/test/sun/security/krb5/tools/ktcheck.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/krb5/tools/ktcheck.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/mscapi/AccessKeyStore.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/mscapi/AccessKeyStore.sh Thu Dec 13 14:47:35 2012 +0000
@@ -42,13 +42,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/jdk/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh Thu Dec 13 14:47:35 2012 +0000
@@ -40,7 +40,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/jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/mscapi/PublicKeyInterop.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/mscapi/PublicKeyInterop.sh Thu Dec 13 14:47:35 2012 +0000
@@ -62,7 +62,7 @@
echo
echo "Running the test..."
${TESTJAVA}/bin/javac -d . ${TESTSRC}\\PublicKeyInterop.java
- ${TESTJAVA}/bin/java PublicKeyInterop
+ ${TESTJAVA}/bin/java ${TESTVMOPTS} PublicKeyInterop
rc=$?
--- a/jdk/test/sun/security/mscapi/RSAEncryptDecrypt.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/mscapi/RSAEncryptDecrypt.sh Thu Dec 13 14:47:35 2012 +0000
@@ -70,7 +70,7 @@
# unsupported
${TESTJAVA}/bin/javac -d . ${TESTSRC}\\RSAEncryptDecrypt.java
- ${TESTJAVA}/bin/java RSAEncryptDecrypt
+ ${TESTJAVA}/bin/java ${TESTVMOPTS} RSAEncryptDecrypt
exit
;;
--- a/jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Thu Dec 13 14:47:35 2012 +0000
@@ -89,7 +89,7 @@
echo "Running the test..."
${TESTJAVA}${FS}bin${FS}javac -d . \
${TESTSRC}${FS}ShortRSAKeyWithinTLS.java
- ${TESTJAVA}${FS}bin${FS}java ShortRSAKeyWithinTLS 7106773.$BITS $BITS \
+ ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ShortRSAKeyWithinTLS 7106773.$BITS $BITS \
TLSv1.2 TLS_DHE_RSA_WITH_AES_128_CBC_SHA
rc=$?
--- a/jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.sh Thu Dec 13 14:47:35 2012 +0000
@@ -61,7 +61,7 @@
echo
echo "Running the test..."
${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingNONEwithRSA.java
- ${TESTJAVA}/bin/java SignUsingNONEwithRSA
+ ${TESTJAVA}/bin/java ${TESTVMOPTS} SignUsingNONEwithRSA
rc=$?
--- a/jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/mscapi/SignUsingSHA2withRSA.sh Thu Dec 13 14:47:35 2012 +0000
@@ -61,7 +61,7 @@
echo
echo "Running the test..."
${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingSHA2withRSA.java
- ${TESTJAVA}/bin/java SignUsingSHA2withRSA
+ ${TESTJAVA}/bin/java ${TESTVMOPTS} SignUsingSHA2withRSA
rc=$?
--- a/jdk/test/sun/security/pkcs11/KeyStore/Basic.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/pkcs11/KeyStore/Basic.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/pkcs11/KeyStore/Solaris.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/pkcs11/KeyStore/Solaris.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Thu Dec 13 14:47:35 2012 +0000
@@ -99,7 +99,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/jdk/test/sun/security/pkcs11/Provider/Login.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/pkcs11/Provider/Login.sh Thu Dec 13 14:47:35 2012 +0000
@@ -108,7 +108,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/jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Thu Dec 13 14:47:35 2012 +0000
@@ -92,7 +92,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 \
@@ -106,7 +106,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/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/tools/jarsigner/ts.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/tools/jarsigner/ts.sh Thu Dec 13 14:47:35 2012 +0000
@@ -87,5 +87,5 @@
$KT -alias tsbad3 -importcert
$JAVAC -d . ${TESTSRC}/TimestampCheck.java
-$JAVA TimestampCheck
+$JAVA ${TESTVMOPTS} TimestampCheck
--- a/jdk/test/sun/security/tools/keytool/printssl.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/tools/keytool/printssl.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/tools/keytool/standard.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/tools/keytool/standard.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/validator/certreplace.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/validator/certreplace.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/sun/security/validator/samedn.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/sun/security/validator/samedn.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/tools/launcher/6842838/Test6842838.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/tools/launcher/6842838/Test6842838.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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/jdk/test/tools/launcher/MultipleJRE.sh Thu Dec 13 09:37:29 2012 -0500
+++ b/jdk/test/tools/launcher/MultipleJRE.sh Thu Dec 13 14:47:35 2012 +0000
@@ -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`;