test/java/lang/instrument/ParallelTransformerLoader.sh

*** 36,45 ****
--- 36,51 ----
  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
*** 48,67 ****
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
! JAR="${TESTJAVA}"/bin/jar
! JAVAC="${TESTJAVA}"/bin/javac
  JAVA="${TESTJAVA}"/bin/java
  
! "${JAVAC}" -d . \
      "${TESTSRC}"/TestClass1.java \
      "${TESTSRC}"/TestClass2.java \
      "${TESTSRC}"/TestClass3.java
  
! "${JAR}" cvf Test.jar Test*.class
  # Removing the test class files is important. If these
  # .class files are available on the classpath other
  # than via Test.jar, then the deadlock will not reproduce.
  rm -f Test*.class
  
--- 54,73 ----
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
! JAR="${COMPILEJAVA}"/bin/jar
! JAVAC="${COMPILEJAVA}"/bin/javac
  JAVA="${TESTJAVA}"/bin/java
  
! "${JAVAC}"  ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d .\
      "${TESTSRC}"/TestClass1.java \
      "${TESTSRC}"/TestClass2.java \
      "${TESTSRC}"/TestClass3.java
  
! "${JAR}" ${TESTTOOLVMOPTS} cvf Test.jar Test*.class
  # Removing the test class files is important. If these
  # .class files are available on the classpath other
  # than via Test.jar, then the deadlock will not reproduce.
  rm -f Test*.class