diff -r 0b17da070396 -r 3997a6f357cb jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh --- a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Fri Jan 11 12:27:57 2013 +0000 +++ b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Fri Jan 11 20:19:55 2013 +0000 @@ -70,6 +70,12 @@ exit 1 fi +if [ "${COMPILEJAVA}" = "" ] +then + COMPILEJAVA="${TESTJAVA}" +fi +echo "COMPILEJAVA=${COMPILEJAVA}" + if [ "${TESTSRC}" = "" ] then echo "TESTSRC not set. Test cannot execute. Failed." @@ -83,6 +89,6 @@ fi JAVA="${TESTJAVA}/bin/java" -JAVAC="${TESTJAVA}/bin/javac" -JAR="${TESTJAVA}/bin/jar" +JAVAC="${COMPILEJAVA}/bin/javac" +JAR="${COMPILEJAVA}/bin/jar"