test/java/lang/Thread/UncaughtExceptions.sh

*** 32,42 ****
  # @run shell UncaughtExceptions.sh
  
  # To run this test manually, simply do ./UncaughtExceptions.sh
  
   java="${TESTJAVA+${TESTJAVA}/bin/}java"
! javac="${TESTJAVA+${TESTJAVA}/bin/}javac"
  
  failed=""
  Fail() { echo "FAIL: $1"; failed="${failed}."; }
  
  Die() { printf "%s\n" "$*"; exit 1; }
--- 32,42 ----
  # @run shell UncaughtExceptions.sh
  
  # To run this test manually, simply do ./UncaughtExceptions.sh
  
   java="${TESTJAVA+${TESTJAVA}/bin/}java"
! javac="${COMPILEJAVA+${COMPILEJAVA}/bin/}javac"
  
  failed=""
  Fail() { echo "FAIL: $1"; failed="${failed}."; }
  
  Die() { printf "%s\n" "$*"; exit 1; }
*** 119,129 ****
          $mainBody
      }
  }
  EOJAVA
  
!     Sys "$javac" "Seppuku.java"
      CheckCommandResults "$expectedRC" "$expectedOut" "$expectedErr" \
          "$java" "Seppuku"
      Cleanup
  }
  
--- 119,129 ----
          $mainBody
      }
  }
  EOJAVA
  
!     Sys "$javac" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} "Seppuku.java"
      CheckCommandResults "$expectedRC" "$expectedOut" "$expectedErr" \
          "$java" "Seppuku"
      Cleanup
  }