test/java/lang/instrument/MakeJAR.sh

*** 21,31 ****
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  
- 
  if [ "${TESTSRC}" = "" ]
  then
    echo "TESTSRC not set.  Test cannot execute.  Failed."
    exit 1
  fi
--- 21,30 ----
*** 36,53 ****
    echo "TESTJAVA not set.  Test cannot execute.  Failed."
    exit 1
  fi
  echo "TESTJAVA=${TESTJAVA}"
  
  if [ "${TESTCLASSES}" = "" ]
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
! JAVAC="${TESTJAVA}/bin/javac -g"
! JAR="${TESTJAVA}/bin/jar"
  
  cp ${TESTSRC}/InstrumentationHandoff.java InstrumentationHandoff.java
! ${JAVAC} InstrumentationHandoff.java
! ${JAR} cvfm $1.jar ${TESTSRC}/$1.mf InstrumentationHandoff.class
  rm -f InstrumentationHandoff.class InstrumentationHandoff.java
--- 35,58 ----
    echo "TESTJAVA not set.  Test cannot execute.  Failed."
    exit 1
  fi
  echo "TESTJAVA=${TESTJAVA}"
  
+ if [ "${COMPILEJAVA}" = "" ]
+ then
+   COMPILEJAVA="${TESTJAVA}"
+ fi
+ echo "COMPILEJAVA=${COMPILEJAVA}"
+ 
  if [ "${TESTCLASSES}" = "" ]
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
! JAVAC="${COMPILEJAVA}/bin/javac -g"
! JAR="${COMPILEJAVA}/bin/jar"
  
  cp ${TESTSRC}/InstrumentationHandoff.java InstrumentationHandoff.java
! ${JAVAC} ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} InstrumentationHandoff.java
! ${JAR} ${TESTTOOLVMOPTS} cvfm $1.jar ${TESTSRC}/$1.mf InstrumentationHandoff.class
  rm -f InstrumentationHandoff.class InstrumentationHandoff.java