test/sun/rmi/rmic/manifestClassPath/run.sh

@@ -110,31 +110,31 @@
         }
     }
 }
 EOF
 
-Success "$javac" -classpath "jars/A.jar"       Main.java MainI.java
+Success "$javac" ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -classpath "jars/A.jar"       Main.java MainI.java
 Success "$rmic"  -classpath "jars/A.jar${PS}." Main
-Success "$java" ${TESTVMOPTS} -classpath "jars/A.jar${PS}." Main
+Success "$java" ${TESTVMOPTS} ${TESTJAVAOPTS} -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 "$javac" ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -classpath "jars/sub/B.zip"       Main.java MainI.java
 Success "$rmic"  -classpath "jars/sub/B.zip${PS}." Main
-Success "$java" ${TESTVMOPTS}  -classpath "jars/sub/B.zip${PS}." Main
+Success "$java" ${TESTVMOPTS} ${TESTJAVAOPTS}  -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 "$javac" ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -extdirs "jars" -classpath None Main.java MainI.java
 Success "$rmic"  -extdirs "jars" -classpath .    Main
-Success "$java" ${TESTVMOPTS}  -Djava.ext.dirs="jars" -cp .    Main
+Success "$java" ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.ext.dirs="jars" -cp .    Main
 
 Sys rm -f Main_Stub.class
 
-#Success "$javac" -extdirs "jars/sub" -classpath None Main.java MainI.java
+#Success "$javac" ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -extdirs "jars/sub" -classpath None Main.java MainI.java
 Success "$rmic"  -extdirs "jars/sub" -classpath . Main
-Success "$java" ${TESTVMOPTS}  -Djava.ext.dirs="jars/sub" -cp . Main
+Success "$java" ${TESTVMOPTS} ${TESTJAVAOPTS} -Djava.ext.dirs="jars/sub" -cp . Main
 
 Cleanup
 
 Bottom Line