test/java/util/Locale/LocaleProviders.sh

*** 37,46 ****
--- 37,50 ----
  if [ "${TESTJAVA}" = "" ]
  then
    echo "TESTJAVA not set.  Test cannot execute.  Failed."
    exit 1
  fi
+ if [ "${COMPILEJAVA}" = "" ]
+ then
+   COMPILEJAVA="${TESTJAVA}"
+ fi
  echo "TESTJAVA=${TESTJAVA}"
  if [ "${TESTCLASSES}" = "" ]
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
*** 90,101 ****
  }
  EOF
  mk ${SPIDIR}${FS}dest${FS}META-INF${FS}services${FS}java.util.spi.TimeZoneNameProvider << EOF
  tznp
  EOF
! ${TESTJAVA}${FS}bin${FS}javac -d ${SPIDIR}${FS}dest ${SPIDIR}${FS}src${FS}tznp.java
! ${TESTJAVA}${FS}bin${FS}jar cvf ${SPIDIR}${FS}tznp.jar -C ${SPIDIR}${FS}dest .
  
  # get the platform default locales
  PLATDEF=`${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} LocaleProviders getPlatformLocale display`
  DEFLANG=`echo ${PLATDEF} | sed -e "s/,.*//"`
  DEFCTRY=`echo ${PLATDEF} | sed -e "s/.*,//"`
--- 94,106 ----
  }
  EOF
  mk ${SPIDIR}${FS}dest${FS}META-INF${FS}services${FS}java.util.spi.TimeZoneNameProvider << EOF
  tznp
  EOF
! ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d ${SPIDIR}${FS}dest \
!     ${SPIDIR}${FS}src${FS}tznp.java
! ${COMPILEJAVA}${FS}bin${FS}jar ${TESTTOOLVMOPTS} cvf ${SPIDIR}${FS}tznp.jar -C ${SPIDIR}${FS}dest .
  
  # get the platform default locales
  PLATDEF=`${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath ${TESTCLASSES} LocaleProviders getPlatformLocale display`
  DEFLANG=`echo ${PLATDEF} | sed -e "s/,.*//"`
  DEFCTRY=`echo ${PLATDEF} | sed -e "s/.*,//"`