test/java/lang/instrument/PremainClass/NoPremainAgent.sh

*** 35,44 ****
--- 35,50 ----
  then
    echo "TESTJAVA not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
+ if [ "${COMPILEJAVA}" = "" ]
+ then
+   COMPILEJAVA="${TESTJAVA}"
+ fi
+ echo "COMPILEJAVA=${COMPILEJAVA}"
+ 
  if [ "${TESTSRC}" = "" ]
  then
    echo "TESTSRC not set.  Test cannot execute.  Failed."
    exit 1
  fi
*** 47,57 ****
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
! JAVAC="${TESTJAVA}"/bin/javac
  JAVA="${TESTJAVA}"/bin/java
  
  "${JAVA}" ${TESTVMOPTS} -javaagent:NoPremainAgent.jar \
      -classpath "${TESTCLASSES}" DummyMain > output.log 2>&1
  cat output.log
--- 53,63 ----
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
! JAVAC="${COMPILEJAVA}"/bin/javac
  JAVA="${TESTJAVA}"/bin/java
  
  "${JAVA}" ${TESTVMOPTS} -javaagent:NoPremainAgent.jar \
      -classpath "${TESTCLASSES}" DummyMain > output.log 2>&1
  cat output.log