--- old/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh	2014-01-26 11:37:52.920796888 +0800
+++ new/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh	2014-01-26 11:37:52.736796891 +0800
@@ -40,18 +40,18 @@
     #
     #  execute test program - rely on it to exit if platform unsupported
 
-	${TESTJAVA}/bin/javac -d . ${TESTSRC}\\KeyStoreCompatibilityMode.java
+	${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d . ${TESTSRC}\\KeyStoreCompatibilityMode.java
 
     # mode implicitly enabled
-	${TESTJAVA}/bin/java ${TESTVMOPTS} KeyStoreCompatibilityMode
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} KeyStoreCompatibilityMode
 
     # mode explicitly enabled
-	${TESTJAVA}/bin/java ${TESTVMOPTS} \
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} \
 	    -Dsun.security.mscapi.keyStoreCompatibilityMode="true" \
 	    KeyStoreCompatibilityMode
 
     # mode explicitly disabled
-	${TESTJAVA}/bin/java ${TESTVMOPTS} \
+	${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} \
 	    -Dsun.security.mscapi.keyStoreCompatibilityMode="false" \
 	    KeyStoreCompatibilityMode -disable