test/java/lang/instrument/BootClassPath/BootClassPathTest.sh

*** 32,41 ****
--- 32,47 ----
  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
*** 44,85 ****
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
! JAVAC="${TESTJAVA}"/bin/javac
  JAVA="${TESTJAVA}"/bin/java
! JAR="${TESTJAVA}"/bin/jar
  
  echo "Creating manifest file..."
  
! "$JAVAC" -d "${TESTCLASSES}" "${TESTSRC}"/Setup.java
  
  # java Setup <workdir> <premain-class>
  # - outputs boot class path to boot.dir
  
! "$JAVA" -classpath "${TESTCLASSES}" Setup "${TESTCLASSES}" Agent
  BOOTDIR=`cat ${TESTCLASSES}/boot.dir`
  
  echo "Created ${BOOTDIR}"
  
  echo "Building test classes..."
  
! "$JAVAC" -d "${TESTCLASSES}" "${TESTSRC}"/Agent.java "${TESTSRC}"/DummyMain.java
! "$JAVAC" -d "${BOOTDIR}" "${TESTSRC}"/AgentSupport.java
  
  echo "Creating agent jar file..."
  
! "$JAR" -cvfm "${TESTCLASSES}"/Agent.jar "${TESTCLASSES}"/MANIFEST.MF \
      -C "${TESTCLASSES}" Agent.class || exit 1
  
  echo "Running test..."
  
  "${JAVA}" ${TESTVMOPTS} -javaagent:"${TESTCLASSES}"/Agent.jar -classpath "${TESTCLASSES}" DummyMain
  result=$?
  
  echo "Cleanup..."
  
! "$JAVAC" -d "${TESTCLASSES}" "${TESTSRC}"/Cleanup.java
! "$JAVA" -classpath "${TESTCLASSES}" Cleanup "${BOOTDIR}"
  
  exit $result
--- 50,94 ----
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
! JAVAC="${COMPILEJAVA}"/bin/javac
  JAVA="${TESTJAVA}"/bin/java
! JAR="${COMPILEJAVA}"/bin/jar
  
  echo "Creating manifest file..."
  
! "$JAVAC" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" "${TESTSRC}"/Setup.java
  
  # java Setup <workdir> <premain-class>
  # - outputs boot class path to boot.dir
  
! "$JAVA" ${TESTVMOPTS} -classpath "${TESTCLASSES}" Setup "${TESTCLASSES}" Agent
  BOOTDIR=`cat ${TESTCLASSES}/boot.dir`
  
  echo "Created ${BOOTDIR}"
  
  echo "Building test classes..."
  
! "$JAVAC" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" \
!     "${TESTSRC}"/Agent.java "${TESTSRC}"/DummyMain.java
! "$JAVAC" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d "${BOOTDIR}" \
!     "${TESTSRC}"/AgentSupport.java
  
  echo "Creating agent jar file..."
  
! "$JAR" ${TESTTOOLVMOPTS} -cvfm "${TESTCLASSES}"/Agent.jar "${TESTCLASSES}"/MANIFEST.MF \
      -C "${TESTCLASSES}" Agent.class || exit 1
  
  echo "Running test..."
  
  "${JAVA}" ${TESTVMOPTS} -javaagent:"${TESTCLASSES}"/Agent.jar -classpath "${TESTCLASSES}" DummyMain
  result=$?
  
  echo "Cleanup..."
  
! "$JAVAC" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" \
!     "${TESTSRC}"/Cleanup.java
! "$JAVA" ${TESTTOOLVMOPTS} -classpath "${TESTCLASSES}" Cleanup "${BOOTDIR}"
  
  exit $result