--- a/jdk/test/java/lang/instrument/PremainClass/NoPremainAgent.sh	Fri Jan 11 12:27:57 2013 +0000
+++ b/jdk/test/java/lang/instrument/PremainClass/NoPremainAgent.sh	Fri Jan 11 20:19:55 2013 +0000
@@ -37,6 +37,12 @@
   exit 1
 fi
 
+if [ "${COMPILEJAVA}" = "" ]
+then
+  COMPILEJAVA="${TESTJAVA}"
+fi
+echo "COMPILEJAVA=${COMPILEJAVA}"
+
 if [ "${TESTSRC}" = "" ]
 then
   echo "TESTSRC not set.  Test cannot execute.  Failed."
@@ -49,7 +55,7 @@
   exit 1
 fi
 
-JAVAC="${TESTJAVA}"/bin/javac
+JAVAC="${COMPILEJAVA}"/bin/javac
 JAVA="${TESTJAVA}"/bin/java
 
 "${JAVA}" ${TESTVMOPTS} -javaagent:NoPremainAgent.jar \