test/tools/launcher/ClassPathWildCard.sh

*** 41,50 ****
--- 41,54 ----
  if [ "${TESTJAVA}" = "" ]; 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
  
*** 52,63 ****
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
  JAVA=$TESTJAVA/bin/java
! JAVAC=$TESTJAVA/bin/javac
! JAR=$TESTJAVA/bin/jar
  
  OUTEXT=".out"
  
  # We write out a test file, as javaw does not have any notion about
  # stdout or stderr.
--- 56,67 ----
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
  JAVA=$TESTJAVA/bin/java
! JAVAC=$COMPILEJAVA/bin/javac
! JAR=$COMPILEJAVA/bin/jar
  
  OUTEXT=".out"
  
  # We write out a test file, as javaw does not have any notion about
  # stdout or stderr.
*** 89,106 ****
  
  CreateClassFiles() {
    Exp=$1
    [ -d Test${Exp} ] || mkdir Test${Exp} 
    EmitJavaFile Test${Exp}/Test${Exp}.java
!   $JAVAC  -d Test${Exp} Test${Exp}/Test${Exp}.java || exit 1
  }
  
  CreateJarFiles() {
    Exp=$1
    [ -d JarDir ] || mkdir JarDir
    CreateClassFiles $Exp
!   $JAR -cvf JarDir/Test${Exp}.jar -C Test${Exp} . || exit 1
  }
  
  CheckFail() {
    if [ ! -f ${1}${OUTEXT} ]; then
       printf "Error: %s fails\n" "$1"
--- 93,110 ----
  
  CreateClassFiles() {
    Exp=$1
    [ -d Test${Exp} ] || mkdir Test${Exp} 
    EmitJavaFile Test${Exp}/Test${Exp}.java
!   $JAVAC ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d Test${Exp} Test${Exp}/Test${Exp}.java || exit 1
  }
  
  CreateJarFiles() {
    Exp=$1
    [ -d JarDir ] || mkdir JarDir
    CreateClassFiles $Exp
!   $JAR ${TESTTOOLVMOPTS} -cvf JarDir/Test${Exp}.jar -C Test${Exp} . || exit 1
  }
  
  CheckFail() {
    if [ ! -f ${1}${OUTEXT} ]; then
       printf "Error: %s fails\n" "$1"