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

*** 55,81 ****
      CPS=";";;
    *)              echo "Unknown platform: `uname`"; exit 1 ;;
  esac
  
  JARD=$DIR/x.jar
! EXTD=$DIR/x.ext
  TESTD=$DIR/x.test
  
  CSS='US-ASCII 8859_1 iso-ir-6 UTF-16 windows-1252 !BAR cp1252'
  
  
! if [ \! -d $EXTD ]; then
      # Initialize
      echo Initializing...
!     rm -rf $JARD $EXTD $TESTD
      mkdir -p $JARD/META-INF/services x.ext
      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"
--- 55,81 ----
      CPS=";";;
    *)              echo "Unknown platform: `uname`"; exit 1 ;;
  esac
  
  JARD=$DIR/x.jar
! APPD=$DIR/x.ext
  TESTD=$DIR/x.test
  
  CSS='US-ASCII 8859_1 iso-ir-6 UTF-16 windows-1252 !BAR cp1252'
  
  
! if [ \! -d $APPD ]; then
      # Initialize
      echo Initializing...
!     rm -rf $JARD $APPD $TESTD
      mkdir -p $JARD/META-INF/services x.ext
      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 $APPD/test.jar *)
  fi
  
  if [ $# -gt 0 ]; then
      # Use locale specified on command line, if it's supported
      L="$1"
*** 94,112 ****
  
  TMP=${TMP:-$TEMP}; TMP=${TMP:-/tmp}
  cd $TMP
  
  failures=0
! for where in ext app; do
    for security in none minimal-policy cp-policy; do
      echo '';
      echo "LC_ALL=$LC_ALL where=$where security=$security"
      av=''
!     if [ $where = ext ]; then
!       av="$av -cp $TESTD -Djava.ext.dirs=$EXTD";
!     else
!       av="$av -cp $TESTD$CPS$EXTD/test.jar";
      fi
      case $security in
        none)          css="$CSS FOO";;
        # Minimal policy in this case is more or less carbon copy of jre default
        # security policy and doesn't give explicit runtime permission
--- 94,110 ----
  
  TMP=${TMP:-$TEMP}; TMP=${TMP:-/tmp}
  cd $TMP
  
  failures=0
! for where in app; do
    for security in none minimal-policy cp-policy; do
      echo '';
      echo "LC_ALL=$LC_ALL where=$where security=$security"
      av=''
!     if [ $where = app ]; then
!       av="$av -cp $TESTD$CPS$APPD/test.jar";
      fi
      case $security in
        none)          css="$CSS FOO";;
        # Minimal policy in this case is more or less carbon copy of jre default
        # security policy and doesn't give explicit runtime permission