test/com/sun/jdi/SuspendNoFlagTest.sh

@@ -73,11 +73,11 @@
           TESTJAVA=$JAVA_HOME
    fi
    TESTSRC=.
    TESTCLASSES=.
    #Deal with .class files:
-   ${TESTJAVA}/bin/javac -d ${TESTCLASSES} \
+   ${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} ${TESTJAVACOPTS} -d ${TESTCLASSES} \
             -classpath "${TESTCLASSES}" -g \
             ${TARGETCLASS}.java
 fi
 #
 echo "JDK under test is: $TESTJAVA"

@@ -91,12 +91,12 @@
    DEBUGEEFLAGS=`cat $TESTCLASSES/../@debuggeeVMOptions`
 fi
 DEBUGEEFLAGS="$DEBUGEEFLAGS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n"
 
 java=java
-echo ${TESTJAVA}/bin/$java ${DEBUGEEFLAGS} ${CP} ${TARGETCLASS}
-eval ${TESTJAVA}/bin/$java ${DEBUGEEFLAGS} ${CP} ${TARGETCLASS}
+echo ${TESTJAVA}/bin/$java ${TESTVMOPTS} ${TESTJAVAOPTS} ${DEBUGEEFLAGS} ${CP} ${TARGETCLASS}
+eval ${TESTJAVA}/bin/$java ${TESTVMOPTS} ${TESTJAVAOPTS} ${DEBUGEEFLAGS} ${CP} ${TARGETCLASS}
 status=$?
 echo "test status was: $status"
 if [ $status -eq "0" ] ;
    then pass "status = 0 and no timeout occured"