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

*** 61,71 ****
  "$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..."
--- 61,71 ----
  "$JAVAC" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" "${TESTSRC}"/Setup.java
  
  # java Setup <workdir> <premain-class>
  # - outputs boot class path to boot.dir
  
! "$JAVA" ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTCLASSES}" Setup "${TESTCLASSES}" Agent
  BOOTDIR=`cat ${TESTCLASSES}/boot.dir`
  
  echo "Created ${BOOTDIR}"
  
  echo "Building test classes..."
*** 80,94 ****
  "$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
--- 80,94 ----
  "$JAR" ${TESTTOOLVMOPTS} -cvfm "${TESTCLASSES}"/Agent.jar "${TESTCLASSES}"/MANIFEST.MF \
      -C "${TESTCLASSES}" Agent.class || exit 1
  
  echo "Running test..."
  
! "${JAVA}" ${TESTVMOPTS} ${TESTJAVAOPTS} -javaagent:"${TESTCLASSES}"/Agent.jar -classpath "${TESTCLASSES}" DummyMain
  result=$?
  
  echo "Cleanup..."
  
  "$JAVAC" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d "${TESTCLASSES}" \
      "${TESTSRC}"/Cleanup.java
! "$JAVA" ${TESTVMOPTS} ${TESTJAVAOPTS} -classpath "${TESTCLASSES}" Cleanup "${BOOTDIR}"
  
  exit $result