test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh

@@ -68,10 +68,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

@@ -81,8 +87,8 @@
   echo "TESTCLASSES not set.  Test cannot execute.  Failed."
   exit 1
 fi
 
 JAVA="${TESTJAVA}/bin/java"
-JAVAC="${TESTJAVA}/bin/javac"
-JAR="${TESTJAVA}/bin/jar"
+JAVAC="${COMPILEJAVA}/bin/javac"
+JAR="${COMPILEJAVA}/bin/jar"