test/java/util/prefs/PrefsSpi.sh

*** 37,50 ****
      if [ $# -lt 1 ]; then exit 1; fi
      TESTJAVA="$1"; shift
      TESTSRC="`pwd`"
      TESTCLASSES="`pwd`"
  fi
  
   java="$TESTJAVA/bin/java"
! javac="$TESTJAVA/bin/javac"
!   jar="$TESTJAVA/bin/jar"
  
  Die() { printf "%s\n" "$*"; exit 1; }
  
  Sys() {
      printf "%s\n" "$*"; "$@"; rc="$?";
--- 37,53 ----
      if [ $# -lt 1 ]; then exit 1; fi
      TESTJAVA="$1"; shift
      TESTSRC="`pwd`"
      TESTCLASSES="`pwd`"
  fi
+ if [ -z "$COMPILEJAVA" ]; then
+     COMPILEJAVA="${TESTJAVA}"
+ fi
  
   java="$TESTJAVA/bin/java"
! javac="$COMPILEJAVA/bin/javac"
!   jar="$COMPILEJAVA/bin/jar"
  
  Die() { printf "%s\n" "$*"; exit 1; }
  
  Sys() {
      printf "%s\n" "$*"; "$@"; rc="$?";
*** 79,91 ****
  
  Sys rm -rf jarDir extDir
  Sys mkdir -p jarDir/META-INF/services extDir
  echo "StubPreferencesFactory" \
    > "jarDir/META-INF/services/java.util.prefs.PreferencesFactory"
! Sys "$javac" -d jarDir StubPreferencesFactory.java StubPreferences.java
  
! (cd jarDir && "$jar" "cf" "../extDir/PrefsSpi.jar" ".")
  
  case "`uname`" in Windows*|CYGWIN* ) CPS=';';; *) CPS=':';; esac
  
  Sys "$java" ${TESTVMOPTS} "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
      -Djava.util.prefs.PreferencesFactory=StubPreferencesFactory \
--- 82,94 ----
  
  Sys rm -rf jarDir extDir
  Sys mkdir -p jarDir/META-INF/services extDir
  echo "StubPreferencesFactory" \
    > "jarDir/META-INF/services/java.util.prefs.PreferencesFactory"
! Sys "$javac" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d jarDir StubPreferencesFactory.java StubPreferences.java
  
! (cd jarDir && "$jar" ${TESTTOOLVMOPTS} "cf" "../extDir/PrefsSpi.jar" ".")
  
  case "`uname`" in Windows*|CYGWIN* ) CPS=';';; *) CPS=':';; esac
  
  Sys "$java" ${TESTVMOPTS} "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
      -Djava.util.prefs.PreferencesFactory=StubPreferencesFactory \