test/javax/script/CommonSetup.sh

*** 61,70 ****
--- 61,75 ----
  then
    echo "TESTJAVA not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
+ if [ "${COMPILEJAVA}" = "" ]
+ then
+   COMPILEJAVA="${TESTJAVA}"
+ fi
+ 
  if [ "${TESTSRC}" = "" ]
  then
    echo "TESTSRC not set.  Test cannot execute.  Failed."
    exit 1
  fi
*** 74,81 ****
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
  JAVA="${TESTJAVA}/bin/java"
! JAVAC="${TESTJAVA}/bin/javac"
! JAR="${TESTJAVA}/bin/jar"
  
--- 79,86 ----
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
  JAVA="${TESTJAVA}/bin/java"
! JAVAC="${COMPILEJAVA}/bin/javac"
! JAR="${COMPILEJAVA}/bin/jar"