--- a/jdk/test/javax/script/CommonSetup.sh	Fri Jan 11 12:27:57 2013 +0000
+++ b/jdk/test/javax/script/CommonSetup.sh	Fri Jan 11 20:19:55 2013 +0000
@@ -63,6 +63,11 @@
   exit 1
 fi
 
+if [ "${COMPILEJAVA}" = "" ]
+then
+  COMPILEJAVA="${TESTJAVA}"
+fi
+
 if [ "${TESTSRC}" = "" ]
 then
   echo "TESTSRC not set.  Test cannot execute.  Failed."
@@ -76,6 +81,6 @@
 fi
 
 JAVA="${TESTJAVA}/bin/java"
-JAVAC="${TESTJAVA}/bin/javac"
-JAR="${TESTJAVA}/bin/jar"
+JAVAC="${COMPILEJAVA}/bin/javac"
+JAR="${COMPILEJAVA}/bin/jar"