--- old/test/java/nio/charset/coders/CheckSJISMappingProp.sh	2014-01-26 11:37:17.932797356 +0800
+++ new/test/java/nio/charset/coders/CheckSJISMappingProp.sh	2014-01-26 11:37:17.792797358 +0800
@@ -51,19 +51,19 @@
 }
 
 
-JAVA="${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTCLASSES}"
+JAVA="${TESTJAVA}/bin/java ${TESTVMOPTS} ${TESTJAVAOPTS} -cp ${TESTCLASSES}"
 runTest() {
   echo "Testing:" ${1}
   LC_ALL="$1" ; export LC_ALL
   locale
   # Firstly, test with property set
   # (shift_jis should map to windows-31J charset) 
-  ${JAVA} -Dsun.nio.cs.map="Windows-31J/Shift_JIS" SJISPropTest MS932
+  ${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} -Dsun.nio.cs.map="Windows-31J/Shift_JIS" SJISPropTest MS932
   expectPass $?
 
   # Next, test without property set - "shift_jis" follows IANA conventions
   # and should map to the sun.nio.cs.ext.Shift_JIS charset
-  ${JAVA} SJISPropTest Shift_JIS
+  ${JAVA} ${TESTVMOPTS} ${TESTJAVAOPTS} SJISPropTest Shift_JIS
   expectPass $?
 }