test/java/nio/charset/spi/basic.sh

*** 36,51 ****
  # Command-line usage: sh basic.sh /path/to/build [locale]
  
  if [ -z "$TESTJAVA" ]; then
    if [ $# -lt 1 ]; then exit 1; fi
    TESTJAVA=$1; shift
    TESTSRC=`pwd`
    TESTCLASSES=`pwd`
  fi
  
  JAVA=$TESTJAVA/bin/java
! JAR=$TESTJAVA/bin/jar
  
  DIR=`pwd`
  case `uname` in
    SunOS | Linux | Darwin ) CPS=':' ;;
    Windows* )      CPS=';' ;;
--- 36,52 ----
  # Command-line usage: sh basic.sh /path/to/build [locale]
  
  if [ -z "$TESTJAVA" ]; then
    if [ $# -lt 1 ]; then exit 1; fi
    TESTJAVA=$1; shift
+   COMPILEJDK="${TESTJAVA}"
    TESTSRC=`pwd`
    TESTCLASSES=`pwd`
  fi
  
  JAVA=$TESTJAVA/bin/java
! JAR=$COMPILEJAVA/bin/jar
  
  DIR=`pwd`
  case `uname` in
    SunOS | Linux | Darwin ) CPS=':' ;;
    Windows* )      CPS=';' ;;
*** 70,80 ****
      echo FooProvider \
        >$JARD/META-INF/services/java.nio.charset.spi.CharsetProvider
      cp $TESTCLASSES/FooProvider.class $TESTCLASSES/FooCharset.class $JARD
      mkdir $TESTD
      cp $TESTCLASSES/Test.class $TESTD
!     (cd $JARD; $JAR -cf $EXTD/test.jar *)
  fi
  
  if [ $# -gt 0 ]; then
      # Use locale specified on command line, if it's supported
      L="$1"
--- 71,81 ----
      echo FooProvider \
        >$JARD/META-INF/services/java.nio.charset.spi.CharsetProvider
      cp $TESTCLASSES/FooProvider.class $TESTCLASSES/FooCharset.class $JARD
      mkdir $TESTD
      cp $TESTCLASSES/Test.class $TESTD
!     (cd $JARD; $JAR ${TESTTOOLVMOPTS} -cf $EXTD/test.jar *)
  fi
  
  if [ $# -gt 0 ]; then
      # Use locale specified on command line, if it's supported
      L="$1"