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

@@ -35,10 +35,16 @@
 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,11 +53,11 @@
 then
   echo "TESTCLASSES not set.  Test cannot execute.  Failed."
   exit 1
 fi
 
-JAVAC="${TESTJAVA}"/bin/javac
+JAVAC="${COMPILEJAVA}"/bin/javac
 JAVA="${TESTJAVA}"/bin/java
 
 "${JAVA}" ${TESTVMOPTS} -javaagent:ZeroArgPremainAgent.jar \
     -classpath "${TESTCLASSES}" DummyMain > output.log 2>&1
 cat output.log