From d15bbc7eeea818fbbc8a1661d8c4246de1bab9f9 Mon Sep 17 00:00:00 2001 From: chegar Date: Thu, 13 Dec 2012 14:47:35 +0000 Subject: [PATCH] 8003890: corelibs test scripts should pass TESTVMOPTS Reviewed-by: chegar, alanb Contributed-by: Mark Sheppard --- test/com/oracle/net/sanity.sh | 2 +- test/com/sun/corba/cachedSocket/7056731.sh | 4 +-- .../OperatingSystemMXBean/TestTotalSwap.sh | 2 +- .../GetMaxFileDescriptorCount.sh | 2 +- .../GetOpenFileDescriptorCount.sh | 2 +- test/com/sun/tools/attach/ApplicationSetup.sh | 4 +-- test/com/sun/tools/attach/BasicTests.sh | 2 +- test/com/sun/tools/attach/PermissionTests.sh | 4 +-- test/com/sun/tools/attach/ProviderTests.sh | 2 +- .../sun/tools/extcheck/TestExtcheckArgs.sh | 2 +- test/demo/zipfs/basic.sh | 2 +- test/java/io/File/GetXSpace.sh | 2 +- test/java/io/File/MacPathTest.sh | 2 +- test/java/io/File/basic.sh | 2 +- test/java/io/FileOutputStream/FileOpen.sh | 8 ++--- test/java/io/Serializable/class/run.sh | 32 ++++++++--------- .../evolution/AddedExternField/run.sh | 4 +-- .../evolution/RenamePackage/run.sh | 8 ++--- .../Serializable/maskSyntheticModifier/run.sh | 2 +- .../java/io/Serializable/packageAccess/run.sh | 2 +- .../Serializable/resolveClass/consTest/run.sh | 2 +- .../resolveClass/deserializeButton/run.sh | 2 +- test/java/io/Serializable/subclass/run.sh | 2 +- .../io/Serializable/superclassDataLoss/run.sh | 2 +- .../Serializable/unnamedPackageSwitch/run.sh | 2 +- test/java/lang/Class/forName/NonJavaNames.sh | 2 +- test/java/lang/ClassLoader/Assert.sh | 2 +- .../ClassLoader/deadlock/TestCrossDelegate.sh | 1 + .../deadlock/TestOneWayDelegate.sh | 1 + test/java/lang/ClassLoader/getdotresource.sh | 2 +- test/java/lang/Runtime/exec/setcwd.sh | 2 +- test/java/lang/StringCoding/CheckEncodings.sh | 2 +- test/java/lang/System/finalization/FinExit.sh | 2 +- .../lang/annotation/loaderLeak/LoaderLeak.sh | 4 +-- .../TestSystemLoadAvg.sh | 2 +- test/java/net/Authenticator/B4933582.sh | 4 +-- .../ADatagramSocket.sh | 2 +- test/java/net/InetAddress/ptr/lookup.sh | 4 +-- .../AcceptCauseFileDescriptorLeak.sh | 2 +- test/java/net/Socket/OldSocketImpl.sh | 2 +- test/java/net/URL/B5086147.sh | 2 +- test/java/net/URL/runconstructor.sh | 2 +- test/java/net/URLClassLoader/B5077773.sh | 2 +- .../getresourceasstream/test.sh | 4 +-- .../net/URLClassLoader/sealing/checksealed.sh | 4 +-- test/java/net/URLConnection/6212146/test.sh | 2 +- test/java/net/URLConnection/UNCTest.sh | 2 +- test/java/nio/Buffer/LimitDirectMemory.sh | 5 +-- .../AsynchronousChannelGroup/run_any_task.sh | 8 ++--- .../custom_provider.sh | 2 +- test/java/nio/charset/Charset/default.sh | 2 +- .../charset/coders/CheckSJISMappingProp.sh | 2 +- test/java/nio/charset/spi/basic.sh | 2 +- test/java/nio/file/Files/delete_on_close.sh | 2 +- .../file/Files/walkFileTree/walk_file_tree.sh | 12 +++---- test/java/nio/file/Path/MacPathTest.sh | 2 +- .../Activatable/extLoadedImpl/ext.sh | 4 +-- test/java/rmi/registry/readTest/readTest.sh | 4 +-- .../reliability/benchmark/runSerialBench.sh | 34 +++++++++---------- .../ClassLoaderDeadlock.sh | 2 +- .../Security/ClassLoaderDeadlock/Deadlock.sh | 2 +- .../Security/ClassLoaderDeadlock/Deadlock2.sh | 4 +-- .../java/security/Security/signedfirst/Dyn.sh | 2 +- .../security/Security/signedfirst/Static.sh | 2 +- .../cert/CertificateFactory/slowstream.sh | 4 +-- test/java/util/Currency/PropertiesTest.sh | 4 +-- test/java/util/Locale/LocaleCategory.sh | 4 +-- test/java/util/Locale/LocaleProviders.sh | 6 ++-- test/java/util/PluggableLocale/ExecTest.sh | 4 +-- .../util/ResourceBundle/Bug6299235Test.sh | 2 +- .../Control/MissingResourceCauseTest.sh | 2 +- test/java/util/ServiceLoader/basic.sh | 2 +- test/java/util/TimeZone/OldIDMappingTest.sh | 4 +-- .../TimeZone/TimeZoneDatePermissionCheck.sh | 2 +- test/java/util/prefs/CheckUserPrefsStorage.sh | 4 +-- test/java/util/prefs/PrefsSpi.sh | 8 ++--- .../UserDefaultControlTest.sh | 3 +- test/java/util/zip/3GBZipFiles.sh | 3 +- test/java/util/zip/ZipFile/deletetempjar.sh | 2 +- .../crypto/SecretKeyFactory/FailOverTest.sh | 1 + test/javax/print/applet/AppletPrintLookup.sh | 2 +- test/javax/script/ProviderTest.sh | 2 +- test/javax/security/auth/Subject/doAs/Test.sh | 2 +- .../lib/security/java.policy/Ext_AllPolicy.sh | 2 +- .../MonitoredVm/MonitorVmStartTerminate.sh | 2 +- .../jmxremote/bootstrap/CustomLauncherTest.sh | 2 +- .../bootstrap/LocalManagementTest.sh | 8 ++--- .../bootstrap/PasswordFilePermissionTest.sh | 6 ++-- .../bootstrap/SSLConfigFilePermissionTest.sh | 6 ++-- .../jmxremote/startstop/JMXStartStopTest.sh | 4 +-- test/sun/misc/Cleaner/exitOnThrow.sh | 2 +- .../net/InetAddress/nameservice/dns/cname.sh | 4 +-- test/sun/net/sdp/sanity.sh | 4 +-- test/sun/net/www/MarkResetTest.sh | 2 +- test/sun/net/www/http/HttpClient/RetryPost.sh | 4 +-- .../www/protocol/file/DirPermissionDenied.sh | 2 +- test/sun/net/www/protocol/jar/B5105410.sh | 2 +- .../net/www/protocol/jar/getcontenttype.sh | 2 +- test/sun/net/www/protocol/jar/jarbug/run.sh | 2 +- test/sun/rmi/rmic/manifestClassPath/run.sh | 8 ++--- .../rmi/rmic/minimizeWrapperInstances/run.sh | 8 ++--- .../rmic/oldjavacRemoved/sunToolsJavacMain.sh | 2 +- test/sun/security/krb5/runNameEquals.sh | 4 +-- test/sun/security/krb5/tools/ktcheck.sh | 2 +- test/sun/security/mscapi/AccessKeyStore.sh | 4 +-- .../security/mscapi/IsSunMSCAPIAvailable.sh | 2 +- .../mscapi/KeyStoreCompatibilityMode.sh | 6 ++-- test/sun/security/mscapi/PublicKeyInterop.sh | 2 +- test/sun/security/mscapi/RSAEncryptDecrypt.sh | 2 +- test/sun/security/mscapi/ShortRSAKey1024.sh | 2 +- .../security/mscapi/SignUsingNONEwithRSA.sh | 2 +- .../security/mscapi/SignUsingSHA2withRSA.sh | 2 +- test/sun/security/pkcs11/KeyStore/Basic.sh | 2 +- .../security/pkcs11/KeyStore/ClientAuth.sh | 4 +-- .../pkcs11/KeyStore/SecretKeysBasic.sh | 2 +- test/sun/security/pkcs11/KeyStore/Solaris.sh | 2 +- .../pkcs11/Provider/ConfigQuotedString.sh | 2 +- test/sun/security/pkcs11/Provider/Login.sh | 2 +- .../GrantAllPermToExtWhenNoPolicy.sh | 2 +- .../PolicyFile/getinstance/getinstance.sh | 4 +-- .../EngineArgs/DebugReportsOneExtraByte.sh | 2 +- .../ssl/SSLSocketImpl/NotifyHandshakeTest.sh | 2 +- .../https/HttpsURLConnection/PostThruProxy.sh | 2 +- .../PostThruProxyWithAuth.sh | 2 +- .../security/tools/jarsigner/emptymanifest.sh | 2 +- test/sun/security/tools/jarsigner/ts.sh | 2 +- test/sun/security/tools/keytool/printssl.sh | 2 +- test/sun/security/tools/keytool/standard.sh | 2 +- test/sun/security/validator/certreplace.sh | 2 +- test/sun/security/validator/samedn.sh | 4 +-- test/tools/launcher/6842838/Test6842838.sh | 4 +-- test/tools/launcher/MultipleJRE.sh | 4 +-- 132 files changed, 229 insertions(+), 225 deletions(-) diff --git a/test/com/oracle/net/sanity.sh b/test/com/oracle/net/sanity.sh index b54d866b4..e2c89cc50 100644 --- a/test/com/oracle/net/sanity.sh +++ b/test/com/oracle/net/sanity.sh @@ -63,4 +63,4 @@ CLASSPATH=${TESTCLASSES}:${TESTSRC} 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} diff --git a/test/com/sun/corba/cachedSocket/7056731.sh b/test/com/sun/corba/cachedSocket/7056731.sh index afb2278d3..5244b9a70 100644 --- a/test/com/sun/corba/cachedSocket/7056731.sh +++ b/test/com/sun/corba/cachedSocket/7056731.sh @@ -64,12 +64,12 @@ ORB_PROC=$! 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 diff --git a/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh b/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh index 15faf7040..a4f3726a6 100644 --- a/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh +++ b/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh @@ -59,7 +59,7 @@ fi runOne() { echo "runOne $@" - $TESTJAVA/bin/java -classpath $TESTCLASSES $@ || exit 3 + $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 3 } solaris_swap_size() diff --git a/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh b/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh index e4e163edd..47110c0e7 100644 --- a/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh +++ b/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh @@ -43,7 +43,7 @@ runOne() { 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 diff --git a/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh b/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh index 7cf6ae282..bc3ef465f 100644 --- a/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh +++ b/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh @@ -43,7 +43,7 @@ runOne() { 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 diff --git a/test/com/sun/tools/attach/ApplicationSetup.sh b/test/com/sun/tools/attach/ApplicationSetup.sh index 0537cb6e4..e8296df63 100644 --- a/test/com/sun/tools/attach/ApplicationSetup.sh +++ b/test/com/sun/tools/attach/ApplicationSetup.sh @@ -41,7 +41,7 @@ rm -f ${OUTPUTFILE} 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 @@ startApplication() stopApplication() { - $JAVA -classpath "${TESTCLASSES}" Shutdown $1 + $JAVA ${TESTVMOPTS} -classpath "${TESTCLASSES}" Shutdown $1 } diff --git a/test/com/sun/tools/attach/BasicTests.sh b/test/com/sun/tools/attach/BasicTests.sh index b63d7528f..fc5a7fb24 100644 --- a/test/com/sun/tools/attach/BasicTests.sh +++ b/test/com/sun/tools/attach/BasicTests.sh @@ -61,7 +61,7 @@ failures=0 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 diff --git a/test/com/sun/tools/attach/PermissionTests.sh b/test/com/sun/tools/attach/PermissionTests.sh index 22828dccc..d1cfb3ccc 100644 --- a/test/com/sun/tools/attach/PermissionTests.sh +++ b/test/com/sun/tools/attach/PermissionTests.sh @@ -48,7 +48,7 @@ startApplication 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 @@ if [ $? != 0 ]; then failures=`expr $failures + 1`; fi # 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 diff --git a/test/com/sun/tools/attach/ProviderTests.sh b/test/com/sun/tools/attach/ProviderTests.sh index 2f9297f78..f5d641193 100644 --- a/test/com/sun/tools/attach/ProviderTests.sh +++ b/test/com/sun/tools/attach/ProviderTests.sh @@ -45,7 +45,7 @@ $JAR -cf ${TESTCLASSES}/SimpleProvider.jar \ echo "Running test ..." -$JAVA -classpath \ +$JAVA ${TESTVMOPTS} -classpath \ "${TESTCLASSES}${PS}${TESTCLASSES}/SimpleProvider.jar${PS}${TESTJAVA}/lib/tools.jar" \ ProviderTest diff --git a/test/com/sun/tools/extcheck/TestExtcheckArgs.sh b/test/com/sun/tools/extcheck/TestExtcheckArgs.sh index d9bc0f5af..5adbcfc13 100644 --- a/test/com/sun/tools/extcheck/TestExtcheckArgs.sh +++ b/test/com/sun/tools/extcheck/TestExtcheckArgs.sh @@ -39,7 +39,7 @@ if [ $rc != 0 ]; then 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 diff --git a/test/demo/zipfs/basic.sh b/test/demo/zipfs/basic.sh index b222f87bd..40583d100 100644 --- a/test/demo/zipfs/basic.sh +++ b/test/demo/zipfs/basic.sh @@ -53,7 +53,7 @@ failures=0 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 } diff --git a/test/java/io/File/GetXSpace.sh b/test/java/io/File/GetXSpace.sh index 67fae425c..a7e3a1c7d 100644 --- a/test/java/io/File/GetXSpace.sh +++ b/test/java/io/File/GetXSpace.sh @@ -53,7 +53,7 @@ allow() { } runTest() { - ${TESTJAVA}/bin/java -cp ${TESTCLASSES} GetXSpace $* + ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES} GetXSpace $* if [ $? -eq 0 ] then echo "Passed" else diff --git a/test/java/io/File/MacPathTest.sh b/test/java/io/File/MacPathTest.sh index ebba514af..ecaa5e088 100644 --- a/test/java/io/File/MacPathTest.sh +++ b/test/java/io/File/MacPathTest.sh @@ -36,4 +36,4 @@ if [ "x$TESTJAVA" = x ]; then 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 diff --git a/test/java/io/File/basic.sh b/test/java/io/File/basic.sh index 74a0f71b6..69abf3d2f 100644 --- a/test/java/io/File/basic.sh +++ b/test/java/io/File/basic.sh @@ -44,7 +44,7 @@ case "$OS" in ;; 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) diff --git a/test/java/io/FileOutputStream/FileOpen.sh b/test/java/io/FileOutputStream/FileOpen.sh index a29d3f150..d79c262d4 100644 --- a/test/java/io/FileOutputStream/FileOpen.sh +++ b/test/java/io/FileOutputStream/FileOpen.sh @@ -50,20 +50,20 @@ case "$OS" in ${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 diff --git a/test/java/io/Serializable/class/run.sh b/test/java/io/Serializable/class/run.sh index 470efe19d..26ad08390 100644 --- a/test/java/io/Serializable/class/run.sh +++ b/test/java/io/Serializable/class/run.sh @@ -45,85 +45,85 @@ echo Write NonSerial1, Read NonSerial1 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 diff --git a/test/java/io/Serializable/evolution/AddedExternField/run.sh b/test/java/io/Serializable/evolution/AddedExternField/run.sh index bc5edb0dc..6bb200331 100644 --- a/test/java/io/Serializable/evolution/AddedExternField/run.sh +++ b/test/java/io/Serializable/evolution/AddedExternField/run.sh @@ -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 diff --git a/test/java/io/Serializable/evolution/RenamePackage/run.sh b/test/java/io/Serializable/evolution/RenamePackage/run.sh index 13c4387f7..afa751a84 100644 --- a/test/java/io/Serializable/evolution/RenamePackage/run.sh +++ b/test/java/io/Serializable/evolution/RenamePackage/run.sh @@ -86,13 +86,13 @@ ${JAVAC} -d ${TESTCLASSES}/nclasses ${TESTSRC}/install/SerialDriver.java # 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 diff --git a/test/java/io/Serializable/maskSyntheticModifier/run.sh b/test/java/io/Serializable/maskSyntheticModifier/run.sh index 80ebb7627..075e0dfaf 100644 --- a/test/java/io/Serializable/maskSyntheticModifier/run.sh +++ b/test/java/io/Serializable/maskSyntheticModifier/run.sh @@ -41,5 +41,5 @@ fi 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 diff --git a/test/java/io/Serializable/packageAccess/run.sh b/test/java/io/Serializable/packageAccess/run.sh index ee4314164..3a7f0c148 100644 --- a/test/java/io/Serializable/packageAccess/run.sh +++ b/test/java/io/Serializable/packageAccess/run.sh @@ -45,5 +45,5 @@ ${TESTJAVA}/bin/javac -d . ${TESTSRC}/A.java ${TESTSRC}/B.java \ ${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 diff --git a/test/java/io/Serializable/resolveClass/consTest/run.sh b/test/java/io/Serializable/resolveClass/consTest/run.sh index da7cfe202..62cc8ff75 100644 --- a/test/java/io/Serializable/resolveClass/consTest/run.sh +++ b/test/java/io/Serializable/resolveClass/consTest/run.sh @@ -44,5 +44,5 @@ ${TESTJAVA}/bin/javac -d . ${TESTSRC}/Boot.java ${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 diff --git a/test/java/io/Serializable/resolveClass/deserializeButton/run.sh b/test/java/io/Serializable/resolveClass/deserializeButton/run.sh index 251ef60fd..48208aec4 100644 --- a/test/java/io/Serializable/resolveClass/deserializeButton/run.sh +++ b/test/java/io/Serializable/resolveClass/deserializeButton/run.sh @@ -46,5 +46,5 @@ ${TESTJAVA}/bin/javac -d . ${TESTSRC}/Foo.java ${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 diff --git a/test/java/io/Serializable/subclass/run.sh b/test/java/io/Serializable/subclass/run.sh index 986434500..d7f1d8964 100644 --- a/test/java/io/Serializable/subclass/run.sh +++ b/test/java/io/Serializable/subclass/run.sh @@ -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 diff --git a/test/java/io/Serializable/superclassDataLoss/run.sh b/test/java/io/Serializable/superclassDataLoss/run.sh index c8d12842c..44473748e 100644 --- a/test/java/io/Serializable/superclassDataLoss/run.sh +++ b/test/java/io/Serializable/superclassDataLoss/run.sh @@ -46,5 +46,5 @@ cp cb1.jar cb2.jar 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 diff --git a/test/java/io/Serializable/unnamedPackageSwitch/run.sh b/test/java/io/Serializable/unnamedPackageSwitch/run.sh index 384495d8f..f31e5c114 100644 --- a/test/java/io/Serializable/unnamedPackageSwitch/run.sh +++ b/test/java/io/Serializable/unnamedPackageSwitch/run.sh @@ -41,4 +41,4 @@ fi set -ex ${TESTJAVA}/bin/javac -d . ${TESTSRC}/A.java ${TESTSRC}/Test.java -${TESTJAVA}/bin/java Test +${TESTJAVA}/bin/java ${TESTVMOPTS} Test diff --git a/test/java/lang/Class/forName/NonJavaNames.sh b/test/java/lang/Class/forName/NonJavaNames.sh index b12f04590..1465a3bf0 100644 --- a/test/java/lang/Class/forName/NonJavaNames.sh +++ b/test/java/lang/Class/forName/NonJavaNames.sh @@ -94,7 +94,7 @@ $COPYPLUS 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=$? diff --git a/test/java/lang/ClassLoader/Assert.sh b/test/java/lang/ClassLoader/Assert.sh index 8e6909f65..9bc5e0106 100644 --- a/test/java/lang/ClassLoader/Assert.sh +++ b/test/java/lang/ClassLoader/Assert.sh @@ -49,7 +49,7 @@ cp -R ${TESTSRC}/package2 . ${TESTJAVA}/bin/javac Assert.java -${TESTJAVA}/bin/java Assert +${TESTJAVA}/bin/java ${TESTVMOPTS} Assert result=$? if [ $result -eq 0 ] diff --git a/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh b/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh index 17940eabf..930ba2fc2 100644 --- a/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh +++ b/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh @@ -98,6 +98,7 @@ done # run test ${TESTJAVA}${FS}bin${FS}java \ + ${TESTVMOPTS} \ -verbose:class -XX:+TraceClassLoading -cp . \ -Dtest.classes=${TESTCLASSES} \ Starter cross diff --git a/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh b/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh index 5c2f0172d..311a27602 100644 --- a/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh +++ b/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh @@ -93,6 +93,7 @@ done # run test ${TESTJAVA}${FS}bin${FS}java \ + ${TESTVMOPTS} \ -verbose:class -XX:+TraceClassLoading -cp . \ -Dtest.classes=${TESTCLASSES} \ Starter one-way diff --git a/test/java/lang/ClassLoader/getdotresource.sh b/test/java/lang/ClassLoader/getdotresource.sh index 7cf63c6b5..a6a072335 100644 --- a/test/java/lang/ClassLoader/getdotresource.sh +++ b/test/java/lang/ClassLoader/getdotresource.sh @@ -33,5 +33,5 @@ if [ x"$TESTCLASSES" = x ]; then TESTCLASSES=.; fi 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 diff --git a/test/java/lang/Runtime/exec/setcwd.sh b/test/java/lang/Runtime/exec/setcwd.sh index 14cd01097..7fe155912 100644 --- a/test/java/lang/Runtime/exec/setcwd.sh +++ b/test/java/lang/Runtime/exec/setcwd.sh @@ -37,5 +37,5 @@ cp ${TESTCLASSES}/SetCwd.class . cp ${TESTCLASSES}/SetCwd.class foo # now start the test -${TESTJAVA}/bin/java SetCwd +${TESTJAVA}/bin/java ${TESTVMOPTS} SetCwd diff --git a/test/java/lang/StringCoding/CheckEncodings.sh b/test/java/lang/StringCoding/CheckEncodings.sh index 6b5fc830d..edc5f9a4e 100644 --- a/test/java/lang/StringCoding/CheckEncodings.sh +++ b/test/java/lang/StringCoding/CheckEncodings.sh @@ -49,7 +49,7 @@ runTest() { 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 $? } diff --git a/test/java/lang/System/finalization/FinExit.sh b/test/java/lang/System/finalization/FinExit.sh index 53bc67561..e5eec4320 100644 --- a/test/java/lang/System/finalization/FinExit.sh +++ b/test/java/lang/System/finalization/FinExit.sh @@ -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 diff --git a/test/java/lang/annotation/loaderLeak/LoaderLeak.sh b/test/java/lang/annotation/loaderLeak/LoaderLeak.sh index c7315f5d1..bc72b936c 100644 --- a/test/java/lang/annotation/loaderLeak/LoaderLeak.sh +++ b/test/java/lang/annotation/loaderLeak/LoaderLeak.sh @@ -69,7 +69,7 @@ mkdir -p classes 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 @@ else 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 diff --git a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh index 1f8d823dc..571a3d931 100644 --- a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh +++ b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh @@ -52,7 +52,7 @@ fi 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. diff --git a/test/java/net/Authenticator/B4933582.sh b/test/java/net/Authenticator/B4933582.sh index 66188364c..1dfed10cb 100644 --- a/test/java/net/Authenticator/B4933582.sh +++ b/test/java/net/Authenticator/B4933582.sh @@ -45,5 +45,5 @@ case "$OS" in 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 diff --git a/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh b/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh index 372c04d90..271b21d26 100644 --- a/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh +++ b/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh @@ -49,4 +49,4 @@ case "$OS" in ;; esac -${TESTJAVA}${FILESEP}bin${FILESEP}java -Xbootclasspath/p:${TESTCLASSES} ADatagramSocket true +${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} -Xbootclasspath/p:${TESTCLASSES} ADatagramSocket true diff --git a/test/java/net/InetAddress/ptr/lookup.sh b/test/java/net/InetAddress/ptr/lookup.sh index 2fd083157..3ff73a316 100644 --- a/test/java/net/InetAddress/ptr/lookup.sh +++ b/test/java/net/InetAddress/ptr/lookup.sh @@ -53,13 +53,13 @@ echo "$HOST --> $ADDR" # 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" diff --git a/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh b/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh index 5b0394872..df85f49fe 100644 --- a/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh +++ b/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh @@ -45,4 +45,4 @@ if [ "$NOFILES" = "unlimited" ] || [ $NOFILES -ge 1024 ]; then ulimit -n 1024 fi -${TESTJAVA}/bin/java AcceptCauseFileDescriptorLeak +${TESTJAVA}/bin/java ${TESTVMOPTS} AcceptCauseFileDescriptorLeak diff --git a/test/java/net/Socket/OldSocketImpl.sh b/test/java/net/Socket/OldSocketImpl.sh index 5f429d1e4..bbe055fa2 100644 --- a/test/java/net/Socket/OldSocketImpl.sh +++ b/test/java/net/Socket/OldSocketImpl.sh @@ -50,7 +50,7 @@ esac # 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 diff --git a/test/java/net/URL/B5086147.sh b/test/java/net/URL/B5086147.sh index e92a8ee28..e5830b9ec 100644 --- a/test/java/net/URL/B5086147.sh +++ b/test/java/net/URL/B5086147.sh @@ -47,7 +47,7 @@ ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}B5086147.java 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 diff --git a/test/java/net/URL/runconstructor.sh b/test/java/net/URL/runconstructor.sh index 340f1e91f..5a8f09073 100644 --- a/test/java/net/URL/runconstructor.sh +++ b/test/java/net/URL/runconstructor.sh @@ -50,7 +50,7 @@ failures=0 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 } diff --git a/test/java/net/URLClassLoader/B5077773.sh b/test/java/net/URLClassLoader/B5077773.sh index b489769eb..725829e58 100644 --- a/test/java/net/URLClassLoader/B5077773.sh +++ b/test/java/net/URLClassLoader/B5077773.sh @@ -61,5 +61,5 @@ cp ${TESTSRC}${FS}foo.jar . ${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 diff --git a/test/java/net/URLClassLoader/getresourceasstream/test.sh b/test/java/net/URLClassLoader/getresourceasstream/test.sh index 11aa9bf53..1654f314f 100644 --- a/test/java/net/URLClassLoader/getresourceasstream/test.sh +++ b/test/java/net/URLClassLoader/getresourceasstream/test.sh @@ -46,11 +46,11 @@ checkExit () { ${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 diff --git a/test/java/net/URLClassLoader/sealing/checksealed.sh b/test/java/net/URLClassLoader/sealing/checksealed.sh index c2a048aff..b675eb2f1 100644 --- a/test/java/net/URLClassLoader/sealing/checksealed.sh +++ b/test/java/net/URLClassLoader/sealing/checksealed.sh @@ -56,7 +56,7 @@ if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi 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 diff --git a/test/java/net/URLConnection/6212146/test.sh b/test/java/net/URLConnection/6212146/test.sh index 56a628a42..22c6473c7 100644 --- a/test/java/net/URLConnection/6212146/test.sh +++ b/test/java/net/URLConnection/6212146/test.sh @@ -67,7 +67,7 @@ ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}Test.java 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 $? diff --git a/test/java/net/URLConnection/UNCTest.sh b/test/java/net/URLConnection/UNCTest.sh index 502403b50..aa9f18426 100644 --- a/test/java/net/URLConnection/UNCTest.sh +++ b/test/java/net/URLConnection/UNCTest.sh @@ -36,7 +36,7 @@ OS=`uname -s` 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 ;; diff --git a/test/java/nio/Buffer/LimitDirectMemory.sh b/test/java/nio/Buffer/LimitDirectMemory.sh index 38e8c0c05..027d6279b 100644 --- a/test/java/nio/Buffer/LimitDirectMemory.sh +++ b/test/java/nio/Buffer/LimitDirectMemory.sh @@ -34,7 +34,7 @@ TMP1=tmp_$$ runTest() { echo "Testing: $*" - ${TESTJAVA}/bin/java $* + ${TESTJAVA}/bin/java ${TESTVMOPTS} $* if [ $? -eq 0 ] then echo "--- passed as expected" else @@ -43,10 +43,11 @@ runTest() { 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=" diff --git a/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh b/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh index 6849315e6..8136634d2 100644 --- a/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh +++ b/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh @@ -46,7 +46,7 @@ $JAR -cf "${TESTCLASSES}/Privileged.jar" \ -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 diff --git a/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh b/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh index c334192a2..bf8246501 100644 --- a/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh +++ b/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh @@ -51,7 +51,7 @@ failures=0 go() { echo '' - $JAVA $1 $2 $3 2>&1 + $JAVA ${TESTVMOPTS} $1 $2 $3 2>&1 if [ $? != 0 ]; then failures=`expr $failures + 1`; fi } diff --git a/test/java/nio/charset/Charset/default.sh b/test/java/nio/charset/Charset/default.sh index 5a91ea10c..c93aa71bd 100644 --- a/test/java/nio/charset/Charset/default.sh +++ b/test/java/nio/charset/Charset/default.sh @@ -64,7 +64,7 @@ go() { 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 diff --git a/test/java/nio/charset/coders/CheckSJISMappingProp.sh b/test/java/nio/charset/coders/CheckSJISMappingProp.sh index 49caa0dfe..fd76d5a50 100644 --- a/test/java/nio/charset/coders/CheckSJISMappingProp.sh +++ b/test/java/nio/charset/coders/CheckSJISMappingProp.sh @@ -51,7 +51,7 @@ expectPass() { } -JAVA="${TESTJAVA}/bin/java -cp ${TESTCLASSES}" +JAVA="${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES}" runTest() { echo "Testing:" ${1} LC_ALL="$1" ; export LC_ALL diff --git a/test/java/nio/charset/spi/basic.sh b/test/java/nio/charset/spi/basic.sh index c1bdd45dd..e4f89c582 100644 --- a/test/java/nio/charset/spi/basic.sh +++ b/test/java/nio/charset/spi/basic.sh @@ -116,7 +116,7 @@ for where in ext app; do 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` diff --git a/test/java/nio/file/Files/delete_on_close.sh b/test/java/nio/file/Files/delete_on_close.sh index 7ffa009a8..f6a58683b 100644 --- a/test/java/nio/file/Files/delete_on_close.sh +++ b/test/java/nio/file/Files/delete_on_close.sh @@ -51,7 +51,7 @@ export CLASSPATH 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" diff --git a/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh b/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh index dee0dd06f..6c9d7dc89 100644 --- a/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh +++ b/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh @@ -56,7 +56,7 @@ if [ $? != 0 ]; then exit 1; fi 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 @@ if [ $? != 0 ]; then failures=`expr $failures + 1`; fi # 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 diff --git a/test/java/nio/file/Path/MacPathTest.sh b/test/java/nio/file/Path/MacPathTest.sh index e81c62ae9..e5d410bd1 100644 --- a/test/java/nio/file/Path/MacPathTest.sh +++ b/test/java/nio/file/Path/MacPathTest.sh @@ -36,4 +36,4 @@ if [ "x$TESTJAVA" = x ]; then 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 diff --git a/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh b/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh index 923249652..4f758b410 100644 --- a/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh +++ b/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh @@ -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 @@ rm classes/ExtLoadedImpl.class classes/ExtLoadedImpl_Stub.class classes/CheckLoa 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 diff --git a/test/java/rmi/registry/readTest/readTest.sh b/test/java/rmi/registry/readTest/readTest.sh index 47221ae51..5fda0a5a3 100644 --- a/test/java/rmi/registry/readTest/readTest.sh +++ b/test/java/rmi/registry/readTest/readTest.sh @@ -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 @@ case "$OS" in ;; 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 diff --git a/test/java/rmi/reliability/benchmark/runSerialBench.sh b/test/java/rmi/reliability/benchmark/runSerialBench.sh index 28fa90a00..82a2837bc 100644 --- a/test/java/rmi/reliability/benchmark/runSerialBench.sh +++ b/test/java/rmi/reliability/benchmark/runSerialBench.sh @@ -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 & diff --git a/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh b/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh index a503697dc..a62cba4ec 100644 --- a/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh +++ b/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh @@ -87,7 +87,7 @@ ${TESTJAVA}${FILESEP}bin${FILESEP}javac \ ${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 diff --git a/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh b/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh index 53555ee26..e1ed14425 100644 --- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh +++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh @@ -62,5 +62,5 @@ esac 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 diff --git a/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh b/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh index 1109496c7..acf8ff210 100644 --- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh +++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh @@ -100,8 +100,8 @@ ${TESTJAVA}${FILESEP}bin${FILESEP}jar \ 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 diff --git a/test/java/security/Security/signedfirst/Dyn.sh b/test/java/security/Security/signedfirst/Dyn.sh index d87e5ff01..64d0dd3f7 100644 --- a/test/java/security/Security/signedfirst/Dyn.sh +++ b/test/java/security/Security/signedfirst/Dyn.sh @@ -83,7 +83,7 @@ ${TESTJAVA}${FILESEP}bin${FILESEP}javac \ ${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 diff --git a/test/java/security/Security/signedfirst/Static.sh b/test/java/security/Security/signedfirst/Static.sh index 6b41adf31..544a3b1a3 100644 --- a/test/java/security/Security/signedfirst/Static.sh +++ b/test/java/security/Security/signedfirst/Static.sh @@ -84,7 +84,7 @@ ${TESTJAVA}${FILESEP}bin${FILESEP}javac \ # 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 diff --git a/test/java/security/cert/CertificateFactory/slowstream.sh b/test/java/security/cert/CertificateFactory/slowstream.sh index fbca87e46..72d3fcf6c 100644 --- a/test/java/security/cert/CertificateFactory/slowstream.sh +++ b/test/java/security/cert/CertificateFactory/slowstream.sh @@ -46,5 +46,5 @@ case "$OS" in 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 diff --git a/test/java/util/Currency/PropertiesTest.sh b/test/java/util/Currency/PropertiesTest.sh index 874e7ac30..6c1685106 100644 --- a/test/java/util/Currency/PropertiesTest.sh +++ b/test/java/util/Currency/PropertiesTest.sh @@ -70,7 +70,7 @@ failures=0 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 @@ cp ${PROPS} $PROPLOCATION # 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 diff --git a/test/java/util/Locale/LocaleCategory.sh b/test/java/util/Locale/LocaleCategory.sh index 34becd35a..84b6119ec 100644 --- a/test/java/util/Locale/LocaleCategory.sh +++ b/test/java/util/Locale/LocaleCategory.sh @@ -69,7 +69,7 @@ esac # 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 @@ fi # 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} diff --git a/test/java/util/Locale/LocaleProviders.sh b/test/java/util/Locale/LocaleProviders.sh index 59e43fcff..3cf0d4e7c 100644 --- a/test/java/util/Locale/LocaleProviders.sh +++ b/test/java/util/Locale/LocaleProviders.sh @@ -96,12 +96,12 @@ ${TESTJAVA}${FS}bin${FS}javac -d ${SPIDIR}${FS}dest ${SPIDIR}${FS}src${FS}tznp.j ${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 @@ echo "DEFFMTCTRY=${DEFFMTCTRY}" 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=$? diff --git a/test/java/util/PluggableLocale/ExecTest.sh b/test/java/util/PluggableLocale/ExecTest.sh index 18bd8d16f..c01e9e827 100644 --- a/test/java/util/PluggableLocale/ExecTest.sh +++ b/test/java/util/PluggableLocale/ExecTest.sh @@ -119,9 +119,9 @@ fi # 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} diff --git a/test/java/util/ResourceBundle/Bug6299235Test.sh b/test/java/util/ResourceBundle/Bug6299235Test.sh index ef17b4121..8bcb74f10 100644 --- a/test/java/util/ResourceBundle/Bug6299235Test.sh +++ b/test/java/util/ResourceBundle/Bug6299235Test.sh @@ -75,7 +75,7 @@ echo "NEW_EXT_DIR=${NEW_EXT_DIR}" 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 diff --git a/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh b/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh index 7bb77326a..d23ada5c9 100644 --- a/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh +++ b/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh @@ -50,7 +50,7 @@ chmod 000 $UNREADABLE : ${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 diff --git a/test/java/util/ServiceLoader/basic.sh b/test/java/util/ServiceLoader/basic.sh index 259b2e156..72d68fab7 100644 --- a/test/java/util/ServiceLoader/basic.sh +++ b/test/java/util/ServiceLoader/basic.sh @@ -94,7 +94,7 @@ go() { 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 } diff --git a/test/java/util/TimeZone/OldIDMappingTest.sh b/test/java/util/TimeZone/OldIDMappingTest.sh index 0f776e4e1..f7d67ba17 100644 --- a/test/java/util/TimeZone/OldIDMappingTest.sh +++ b/test/java/util/TimeZone/OldIDMappingTest.sh @@ -40,7 +40,7 @@ do 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 @@ do 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 diff --git a/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh b/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh index 226228f17..4a295ce53 100644 --- a/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh +++ b/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh @@ -53,6 +53,6 @@ ${TESTJAVA}/bin/jarsigner \ # 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 diff --git a/test/java/util/prefs/CheckUserPrefsStorage.sh b/test/java/util/prefs/CheckUserPrefsStorage.sh index 5314b120c..28210696b 100644 --- a/test/java/util/prefs/CheckUserPrefsStorage.sh +++ b/test/java/util/prefs/CheckUserPrefsStorage.sh @@ -50,14 +50,14 @@ case "$OS" in 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 diff --git a/test/java/util/prefs/PrefsSpi.sh b/test/java/util/prefs/PrefsSpi.sh index b140b3062..877522e3f 100644 --- a/test/java/util/prefs/PrefsSpi.sh +++ b/test/java/util/prefs/PrefsSpi.sh @@ -87,17 +87,17 @@ Sys "$javac" -d jarDir StubPreferencesFactory.java StubPreferences.java 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" diff --git a/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh b/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh index c6b912356..538142606 100644 --- a/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh +++ b/test/java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.sh @@ -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 + diff --git a/test/java/util/zip/3GBZipFiles.sh b/test/java/util/zip/3GBZipFiles.sh index 9caf10900..65db4e296 100644 --- a/test/java/util/zip/3GBZipFiles.sh +++ b/test/java/util/zip/3GBZipFiles.sh @@ -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 @@ buildFile () huge-*) filesize_="$hugeSize" ;; tiny-*) filesize_="$tinySize" ;; esac - sys "$JAVA" "-cp" "$TESTCLASSES" "FileBuilder" \ + sys "$JAVA" ${TESTVMOPTS} "-cp" "$TESTCLASSES" "FileBuilder" \ "$filetype_" "$filename_" "$filesize_" } diff --git a/test/java/util/zip/ZipFile/deletetempjar.sh b/test/java/util/zip/ZipFile/deletetempjar.sh index afa47feb9..bad1a0f1e 100644 --- a/test/java/util/zip/ZipFile/deletetempjar.sh +++ b/test/java/util/zip/ZipFile/deletetempjar.sh @@ -30,7 +30,7 @@ if [ "x$TESTJAVA" = x ]; then 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 diff --git a/test/javax/crypto/SecretKeyFactory/FailOverTest.sh b/test/javax/crypto/SecretKeyFactory/FailOverTest.sh index b23e2bd99..ab8bb0ed8 100644 --- a/test/javax/crypto/SecretKeyFactory/FailOverTest.sh +++ b/test/javax/crypto/SecretKeyFactory/FailOverTest.sh @@ -82,6 +82,7 @@ if [ $? -ne 0 ]; then fi ${TESTJAVA}${FS}bin${FS}java \ + ${TESTVMOPTS} \ -classpath "${TESTSRC}${FS}P1.jar${PS}${TESTSRC}${FS}P2.jar${PS}." \ FailOverTest result=$? diff --git a/test/javax/print/applet/AppletPrintLookup.sh b/test/javax/print/applet/AppletPrintLookup.sh index c49b9f09c..06afe6ffd 100644 --- a/test/javax/print/applet/AppletPrintLookup.sh +++ b/test/javax/print/applet/AppletPrintLookup.sh @@ -82,7 +82,7 @@ cp ${TESTSRC}${SEP}AppletPrintLookup.html ${TESTCLASSES} ${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!" diff --git a/test/javax/script/ProviderTest.sh b/test/javax/script/ProviderTest.sh index 5221d00d5..c39a93339 100644 --- a/test/javax/script/ProviderTest.sh +++ b/test/javax/script/ProviderTest.sh @@ -45,6 +45,6 @@ $JAR -cf ${TESTCLASSES}/dummy.jar \ echo "Running test ..." -$JAVA -classpath \ +$JAVA ${TESTVMOPTS} -classpath \ "${TESTCLASSES}${PS}${TESTCLASSES}/dummy.jar" \ ProviderTest diff --git a/test/javax/security/auth/Subject/doAs/Test.sh b/test/javax/security/auth/Subject/doAs/Test.sh index cbf94e031..65ef4531e 100644 --- a/test/javax/security/auth/Subject/doAs/Test.sh +++ b/test/javax/security/auth/Subject/doAs/Test.sh @@ -71,7 +71,7 @@ WD=`pwd` 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 diff --git a/test/lib/security/java.policy/Ext_AllPolicy.sh b/test/lib/security/java.policy/Ext_AllPolicy.sh index e4184062a..3efcce9b4 100644 --- a/test/lib/security/java.policy/Ext_AllPolicy.sh +++ b/test/lib/security/java.policy/Ext_AllPolicy.sh @@ -77,7 +77,7 @@ cd ${TESTCLASSES} ${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 $? diff --git a/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh b/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh index c4b4756e4..558ac9cf1 100644 --- a/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh +++ b/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh @@ -41,4 +41,4 @@ verify_os JAVA="${TESTJAVA}/bin/java" CP=${TESTJAVA}${FS}lib${FS}tools.jar${PS}${TESTCLASSES} -${JAVA} -classpath ${CP} MonitorVmStartTerminate +${JAVA} ${TESTVMOPTS} -classpath ${CP} MonitorVmStartTerminate diff --git a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh index 0cc4afade..8622fba94 100644 --- a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh +++ b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh @@ -150,7 +150,7 @@ while true; do 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" diff --git a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh index 426e5d4ba..7338cbe86 100644 --- a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh +++ b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh @@ -43,8 +43,8 @@ doTest() 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 @@ doTest() 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 @@ doTest " " # 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 diff --git a/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh b/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh index 700a2b188..dfc4a85ad 100644 --- a/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh +++ b/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh @@ -104,18 +104,18 @@ pp=-Dcom.sun.management.jmxremote.port=4888 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 diff --git a/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh b/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh index 46927ec83..0fa765409 100644 --- a/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh +++ b/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh @@ -101,18 +101,18 @@ pp=-Dcom.sun.management.jmxremote.port=4999 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 diff --git a/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh b/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh index f52146b3b..6d48e1720 100644 --- a/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh +++ b/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh @@ -61,7 +61,7 @@ _compile(){ } _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 @@ _exit_on_jtreg(){ } _testme(){ - ${TESTJAVA}/bin/java -cp ${_testclasses} JMXStartStopTest $* + ${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${_testclasses} JMXStartStopTest $* } diff --git a/test/sun/misc/Cleaner/exitOnThrow.sh b/test/sun/misc/Cleaner/exitOnThrow.sh index f6090cd42..7506ce440 100644 --- a/test/sun/misc/Cleaner/exitOnThrow.sh +++ b/test/sun/misc/Cleaner/exitOnThrow.sh @@ -39,7 +39,7 @@ if [ -z "$TESTJAVA" ]; then 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 diff --git a/test/sun/net/InetAddress/nameservice/dns/cname.sh b/test/sun/net/InetAddress/nameservice/dns/cname.sh index 9587d6af5..13c922aed 100644 --- a/test/sun/net/InetAddress/nameservice/dns/cname.sh +++ b/test/sun/net/InetAddress/nameservice/dns/cname.sh @@ -42,7 +42,7 @@ CLASSPATH=${TESTCLASSES} 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 @@ failures=0 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 } diff --git a/test/sun/net/sdp/sanity.sh b/test/sun/net/sdp/sanity.sh index 0de27095d..88d80e016 100644 --- a/test/sun/net/sdp/sanity.sh +++ b/test/sun/net/sdp/sanity.sh @@ -57,7 +57,7 @@ CLASSPATH=${TESTCLASSES}:${TESTSRC} 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 @@ do 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 diff --git a/test/sun/net/www/MarkResetTest.sh b/test/sun/net/www/MarkResetTest.sh index c3eb53a56..542bfe4b1 100644 --- a/test/sun/net/www/MarkResetTest.sh +++ b/test/sun/net/www/MarkResetTest.sh @@ -52,4 +52,4 @@ ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}MarkResetTest.java # in this directory cp ${TESTSRC}${FS}EncDec.doc . -${TESTJAVA}${FS}bin${FS}java MarkResetTest +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} MarkResetTest diff --git a/test/sun/net/www/http/HttpClient/RetryPost.sh b/test/sun/net/www/http/HttpClient/RetryPost.sh index 314a007c6..fc563c83b 100644 --- a/test/sun/net/www/http/HttpClient/RetryPost.sh +++ b/test/sun/net/www/http/HttpClient/RetryPost.sh @@ -50,14 +50,14 @@ esac ${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 diff --git a/test/sun/net/www/protocol/file/DirPermissionDenied.sh b/test/sun/net/www/protocol/file/DirPermissionDenied.sh index a85f4d53a..7606b3dd9 100644 --- a/test/sun/net/www/protocol/file/DirPermissionDenied.sh +++ b/test/sun/net/www/protocol/file/DirPermissionDenied.sh @@ -35,7 +35,7 @@ rm -rf ${TESTDIR} 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 diff --git a/test/sun/net/www/protocol/jar/B5105410.sh b/test/sun/net/www/protocol/jar/B5105410.sh index 3dbce7f3f..1fdbdd58f 100644 --- a/test/sun/net/www/protocol/jar/B5105410.sh +++ b/test/sun/net/www/protocol/jar/B5105410.sh @@ -51,5 +51,5 @@ esac 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 diff --git a/test/sun/net/www/protocol/jar/getcontenttype.sh b/test/sun/net/www/protocol/jar/getcontenttype.sh index da3563db5..a3a1a2a13 100644 --- a/test/sun/net/www/protocol/jar/getcontenttype.sh +++ b/test/sun/net/www/protocol/jar/getcontenttype.sh @@ -33,5 +33,5 @@ if [ x"$TESTCLASSES" = x ]; then TESTCLASSES=.; fi 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 diff --git a/test/sun/net/www/protocol/jar/jarbug/run.sh b/test/sun/net/www/protocol/jar/jarbug/run.sh index 31cfbe861..72a11681d 100644 --- a/test/sun/net/www/protocol/jar/jarbug/run.sh +++ b/test/sun/net/www/protocol/jar/jarbug/run.sh @@ -71,7 +71,7 @@ mv jar1.jar .. # ${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 diff --git a/test/sun/rmi/rmic/manifestClassPath/run.sh b/test/sun/rmi/rmic/manifestClassPath/run.sh index 4faf141ff..f20ab7552 100644 --- a/test/sun/rmi/rmic/manifestClassPath/run.sh +++ b/test/sun/rmi/rmic/manifestClassPath/run.sh @@ -114,26 +114,26 @@ EOF 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 diff --git a/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh b/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh index 204947dce..3c8e831e3 100644 --- a/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh +++ b/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh @@ -41,13 +41,13 @@ fi 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 diff --git a/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh b/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh index fbb558175..11840fa50 100644 --- a/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh +++ b/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh @@ -37,7 +37,7 @@ fi 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 ] diff --git a/test/sun/security/krb5/runNameEquals.sh b/test/sun/security/krb5/runNameEquals.sh index 15096cc99..1fea3620e 100644 --- a/test/sun/security/krb5/runNameEquals.sh +++ b/test/sun/security/krb5/runNameEquals.sh @@ -81,7 +81,7 @@ EXIT_STATUS=0 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 @@ if [ "${NATIVE}" = "true" ] ; then 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 \ diff --git a/test/sun/security/krb5/tools/ktcheck.sh b/test/sun/security/krb5/tools/ktcheck.sh index 383de8fc4..b1b374307 100644 --- a/test/sun/security/krb5/tools/ktcheck.sh +++ b/test/sun/security/krb5/tools/ktcheck.sh @@ -58,7 +58,7 @@ ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}KtabCheck.java EXTRA_OPTIONS="-Djava.security.krb5.conf=${TESTSRC}${FS}onlythree.conf" KTAB="${TESTJAVA}${FS}bin${FS}ktab -J${EXTRA_OPTIONS} -k $KEYTAB -f" -CHECK="${TESTJAVA}${FS}bin${FS}java ${EXTRA_OPTIONS} KtabCheck $KEYTAB" +CHECK="${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} ${EXTRA_OPTIONS} KtabCheck $KEYTAB" echo ${EXTRA_OPTIONS} diff --git a/test/sun/security/mscapi/AccessKeyStore.sh b/test/sun/security/mscapi/AccessKeyStore.sh index 6706aa3ff..0998de482 100644 --- a/test/sun/security/mscapi/AccessKeyStore.sh +++ b/test/sun/security/mscapi/AccessKeyStore.sh @@ -42,13 +42,13 @@ case "$OS" in ${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 diff --git a/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh b/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh index 197ee37b1..77e258e4c 100644 --- a/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh +++ b/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh @@ -40,7 +40,7 @@ case "$OS" in # 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 ;; diff --git a/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh b/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh index ee0c6c360..b6ca1395d 100644 --- a/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh +++ b/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh @@ -43,15 +43,15 @@ case "$OS" in ${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 diff --git a/test/sun/security/mscapi/PublicKeyInterop.sh b/test/sun/security/mscapi/PublicKeyInterop.sh index 1967e63d2..abdad4c65 100644 --- a/test/sun/security/mscapi/PublicKeyInterop.sh +++ b/test/sun/security/mscapi/PublicKeyInterop.sh @@ -62,7 +62,7 @@ case "$OS" in echo echo "Running the test..." ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\PublicKeyInterop.java - ${TESTJAVA}/bin/java PublicKeyInterop + ${TESTJAVA}/bin/java ${TESTVMOPTS} PublicKeyInterop rc=$? diff --git a/test/sun/security/mscapi/RSAEncryptDecrypt.sh b/test/sun/security/mscapi/RSAEncryptDecrypt.sh index 19add0a73..ed17bd115 100644 --- a/test/sun/security/mscapi/RSAEncryptDecrypt.sh +++ b/test/sun/security/mscapi/RSAEncryptDecrypt.sh @@ -70,7 +70,7 @@ case "$OS" in # unsupported ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\RSAEncryptDecrypt.java - ${TESTJAVA}/bin/java RSAEncryptDecrypt + ${TESTJAVA}/bin/java ${TESTVMOPTS} RSAEncryptDecrypt exit ;; diff --git a/test/sun/security/mscapi/ShortRSAKey1024.sh b/test/sun/security/mscapi/ShortRSAKey1024.sh index 1e01377ed..05db70e1a 100644 --- a/test/sun/security/mscapi/ShortRSAKey1024.sh +++ b/test/sun/security/mscapi/ShortRSAKey1024.sh @@ -89,7 +89,7 @@ case "$OS" in 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=$? diff --git a/test/sun/security/mscapi/SignUsingNONEwithRSA.sh b/test/sun/security/mscapi/SignUsingNONEwithRSA.sh index c89a86878..f794e298d 100644 --- a/test/sun/security/mscapi/SignUsingNONEwithRSA.sh +++ b/test/sun/security/mscapi/SignUsingNONEwithRSA.sh @@ -61,7 +61,7 @@ case "$OS" in echo echo "Running the test..." ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingNONEwithRSA.java - ${TESTJAVA}/bin/java SignUsingNONEwithRSA + ${TESTJAVA}/bin/java ${TESTVMOPTS} SignUsingNONEwithRSA rc=$? diff --git a/test/sun/security/mscapi/SignUsingSHA2withRSA.sh b/test/sun/security/mscapi/SignUsingSHA2withRSA.sh index c939fb39e..2d433f108 100644 --- a/test/sun/security/mscapi/SignUsingSHA2withRSA.sh +++ b/test/sun/security/mscapi/SignUsingSHA2withRSA.sh @@ -61,7 +61,7 @@ case "$OS" in echo echo "Running the test..." ${TESTJAVA}/bin/javac -d . ${TESTSRC}\\SignUsingSHA2withRSA.java - ${TESTJAVA}/bin/java SignUsingSHA2withRSA + ${TESTJAVA}/bin/java ${TESTVMOPTS} SignUsingSHA2withRSA rc=$? diff --git a/test/sun/security/pkcs11/KeyStore/Basic.sh b/test/sun/security/pkcs11/KeyStore/Basic.sh index 54408bdfd..452b6290e 100644 --- a/test/sun/security/pkcs11/KeyStore/Basic.sh +++ b/test/sun/security/pkcs11/KeyStore/Basic.sh @@ -171,7 +171,7 @@ fi # 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} \ diff --git a/test/sun/security/pkcs11/KeyStore/ClientAuth.sh b/test/sun/security/pkcs11/KeyStore/ClientAuth.sh index 0593ddf14..d0996c182 100644 --- a/test/sun/security/pkcs11/KeyStore/ClientAuth.sh +++ b/test/sun/security/pkcs11/KeyStore/ClientAuth.sh @@ -128,7 +128,7 @@ ${TESTJAVA}${FS}bin${FS}javac \ # 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 @@ fi # 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} \ diff --git a/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh b/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh index 4041c0e09..303345553 100644 --- a/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh +++ b/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh @@ -141,7 +141,7 @@ fi # 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} \ diff --git a/test/sun/security/pkcs11/KeyStore/Solaris.sh b/test/sun/security/pkcs11/KeyStore/Solaris.sh index 9da8ab9c0..5ec1ac2ec 100644 --- a/test/sun/security/pkcs11/KeyStore/Solaris.sh +++ b/test/sun/security/pkcs11/KeyStore/Solaris.sh @@ -142,7 +142,7 @@ fi # 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 \ diff --git a/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh b/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh index ce5693f59..1a749d894 100644 --- a/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh +++ b/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh @@ -99,7 +99,7 @@ ${TESTJAVA}${FS}bin${FS}javac \ # 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} \ diff --git a/test/sun/security/pkcs11/Provider/Login.sh b/test/sun/security/pkcs11/Provider/Login.sh index 86d8f9e4f..6b37ef837 100644 --- a/test/sun/security/pkcs11/Provider/Login.sh +++ b/test/sun/security/pkcs11/Provider/Login.sh @@ -108,7 +108,7 @@ ${TESTJAVA}${FS}bin${FS}javac \ # 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 \ diff --git a/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh b/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh index ee4035cc6..b09d1564b 100644 --- a/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh +++ b/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh @@ -82,7 +82,7 @@ mv \ ${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 diff --git a/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh b/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh index b52db72b3..893bbb65b 100644 --- a/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh +++ b/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh @@ -92,7 +92,7 @@ ${TESTJAVA}${FS}bin${FS}javac -d ${TESTCLASSES}${FS}boot \ ${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 @@ if [ $status1 -ne 0 ]; then 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 \ diff --git a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh index c2d14c75b..f29f6cedd 100644 --- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh +++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh @@ -59,7 +59,7 @@ echo "Examining debug output for the string:" 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}" diff --git a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh index fa5a410aa..60a38468b 100644 --- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh +++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh @@ -82,7 +82,7 @@ rm -rf com edu # 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 \ diff --git a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh index 7696cbbd6..85e9c22c4 100644 --- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh +++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh @@ -52,5 +52,5 @@ esac ${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 diff --git a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh index 9e2ed3c4b..96c064248 100644 --- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh +++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh @@ -53,5 +53,5 @@ esac ${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 diff --git a/test/sun/security/tools/jarsigner/emptymanifest.sh b/test/sun/security/tools/jarsigner/emptymanifest.sh index 81c0937f4..cbb72413f 100644 --- a/test/sun/security/tools/jarsigner/emptymanifest.sh +++ b/test/sun/security/tools/jarsigner/emptymanifest.sh @@ -65,7 +65,7 @@ class CrLf { } 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 diff --git a/test/sun/security/tools/jarsigner/ts.sh b/test/sun/security/tools/jarsigner/ts.sh index 3293a7dfa..43a3651f6 100644 --- a/test/sun/security/tools/jarsigner/ts.sh +++ b/test/sun/security/tools/jarsigner/ts.sh @@ -87,5 +87,5 @@ $KT -alias tsbad3 -certreq | \ $KT -alias tsbad3 -importcert $JAVAC -d . ${TESTSRC}/TimestampCheck.java -$JAVA TimestampCheck +$JAVA ${TESTVMOPTS} TimestampCheck diff --git a/test/sun/security/tools/keytool/printssl.sh b/test/sun/security/tools/keytool/printssl.sh index b750ffe8d..46de2609b 100644 --- a/test/sun/security/tools/keytool/printssl.sh +++ b/test/sun/security/tools/keytool/printssl.sh @@ -53,7 +53,7 @@ case "$OS" in 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 diff --git a/test/sun/security/tools/keytool/standard.sh b/test/sun/security/tools/keytool/standard.sh index 756d2fb1f..c75a7a49b 100644 --- a/test/sun/security/tools/keytool/standard.sh +++ b/test/sun/security/tools/keytool/standard.sh @@ -58,7 +58,7 @@ esac ${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 diff --git a/test/sun/security/validator/certreplace.sh b/test/sun/security/validator/certreplace.sh index 16470a399..b45a70eda 100644 --- a/test/sun/security/validator/certreplace.sh +++ b/test/sun/security/validator/certreplace.sh @@ -82,4 +82,4 @@ $KT -delete -alias user # 5. Build and run test $JAVAC -d . ${TESTSRC}${FS}CertReplace.java -$JAVA CertReplace certreplace.jks certreplace.certs +$JAVA ${TESTVMOPTS} CertReplace certreplace.jks certreplace.certs diff --git a/test/sun/security/validator/samedn.sh b/test/sun/security/validator/samedn.sh index 9d5afd40a..5d9b04557 100644 --- a/test/sun/security/validator/samedn.sh +++ b/test/sun/security/validator/samedn.sh @@ -78,5 +78,5 @@ $KT -delete -alias user # 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 diff --git a/test/tools/launcher/6842838/Test6842838.sh b/test/tools/launcher/6842838/Test6842838.sh index 6c6e9aa4b..b552152a9 100644 --- a/test/tools/launcher/6842838/Test6842838.sh +++ b/test/tools/launcher/6842838/Test6842838.sh @@ -68,8 +68,8 @@ if [ ! -x ${LIBUMEM} ]; then 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 diff --git a/test/tools/launcher/MultipleJRE.sh b/test/tools/launcher/MultipleJRE.sh index 5c49d8bae..b1ef16f40 100644 --- a/test/tools/launcher/MultipleJRE.sh +++ b/test/tools/launcher/MultipleJRE.sh @@ -49,8 +49,8 @@ then 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`; -- GitLab