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

*** 30,39 ****
--- 30,45 ----
  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
*** 42,55 ****
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
! JAVAC="${TESTJAVA}"/bin/javac
  JAVA="${TESTJAVA}"/bin/java
  
! "$JAVAC" -d "${TESTCLASSES}" "${TESTSRC}"/DummyMain.java
  
  "${JAVA}" ${TESTVMOPTS} -javaagent:"${TESTSRC}"/Agent.jar -classpath "${TESTCLASSES}" DummyMain
  result=$?
  
  exit $result
--- 48,61 ----
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
! JAVAC="${COMPILEJAVA}"/bin/javac
  JAVA="${TESTJAVA}"/bin/java
  
! "$JAVAC" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" "${TESTSRC}"/DummyMain.java
  
  "${JAVA}" ${TESTVMOPTS} -javaagent:"${TESTSRC}"/Agent.jar -classpath "${TESTCLASSES}" DummyMain
  result=$?
  
  exit $result