test/javax/print/applet/AppletPrintLookup.sh

@@ -57,34 +57,34 @@
 JAVAC_CMD=${TESTJAVA}${SEP}bin${SEP}javac
 
 (cd ${TESTSRC} ; ${JAVAC_CMD} -d ${TESTCLASSES} YesNo.java)
 
 mkdir -p ${TESTCLASSES}${SEP}applet0
-(cd ${TESTSRC}${SEP}applet0 ; ${JAVAC_CMD} -d ${TESTCLASSES}${SEP}applet0 Applet0.java)
+(cd ${TESTSRC}${SEP}applet0 ; ${JAVAC_CMD} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES}${SEP}applet0 Applet0.java)
 
 mkdir -p ${TESTCLASSES}${SEP}applet1
-(cd ${TESTSRC}${SEP}applet1 ; ${JAVAC_CMD} -d ${TESTCLASSES}${SEP}applet1 Applet1.java Applet1PrintService.java Applet1PrintServiceLookup.java)
+(cd ${TESTSRC}${SEP}applet1 ; ${JAVAC_CMD} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES}${SEP}applet1 Applet1.java Applet1PrintService.java Applet1PrintServiceLookup.java)
 rm -rf ${TESTCLASSES}${SEP}applet1/META-INF/services
 mkdir -p ${TESTCLASSES}${SEP}applet1/META-INF/services
 cp -p ${TESTSRC}${SEP}applet1/META-INF/services/javax.print.PrintServiceLookup  ${TESTCLASSES}${SEP}applet1/META-INF/services
 (cd ${TESTCLASSES}${SEP}applet1 ; ${TESTJAVA}${SEP}bin${SEP}jar -cf applet1.jar *.class META-INF)
 
 mkdir -p ${TESTCLASSES}${SEP}applet2
-(cd ${TESTSRC}${SEP}applet2 ; ${JAVAC_CMD} -d ${TESTCLASSES}${SEP}applet2 Applet2.java Applet2PrintService.java Applet2PrintServiceLookup.java)
+(cd ${TESTSRC}${SEP}applet2 ; ${JAVAC_CMD} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES}${SEP}applet2 Applet2.java Applet2PrintService.java Applet2PrintServiceLookup.java)
 
 mkdir -p ${TESTCLASSES}${SEP}applet3
-(cd ${TESTSRC}${SEP}applet3 ; ${JAVAC_CMD} -d ${TESTCLASSES}${SEP}applet3 Applet3.java Applet3PrintService.java)
+(cd ${TESTSRC}${SEP}applet3 ; ${JAVAC_CMD} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES}${SEP}applet3 Applet3.java Applet3PrintService.java)
 
 mkdir -p ${TESTCLASSES}${SEP}applet4
-(cd ${TESTSRC}${SEP}applet4 ; ${JAVAC_CMD} -d ${TESTCLASSES}${SEP}applet4 Applet4.java Applet4PrintService.java Applet4PrintServiceLookup.java)
+(cd ${TESTSRC}${SEP}applet4 ; ${JAVAC_CMD} ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES}${SEP}applet4 Applet4.java Applet4PrintService.java Applet4PrintServiceLookup.java)
 
 cp ${TESTSRC}${SEP}AppletPrintLookup.html  ${TESTCLASSES}
 
 ${TESTJAVA}${SEP}bin${SEP}appletviewer ${TESTCLASSES}${SEP}AppletPrintLookup.html &
 
 cd  ${TESTCLASSES} 
-${TESTJAVA}${SEP}bin${SEP}java ${TESTVMOPTS} YesNo
+${TESTJAVA}${SEP}bin${SEP}java ${TESTVMOPTS} ${TESTJAVAOPTS} YesNo
  if [ $? -ne 0 ]
     then
       echo "Test fails!"
       exit 1
     fi