--- old/compiler/4998314/Test.java	Mon Jan  5 11:32:34 2009
+++ new/compiler/4998314/Test.java	Mon Jan  5 11:32:34 2009
@@ -5,7 +5,7 @@
  * @summary compute_compiled_exc_handler() called with pending exception
  *          Fixed in JDK1.4.2_05 Respin b02
  * @compile Test.java
- * @run shell/timeout=240 Test4998313.sh
+ * @run main/othervm/timeout=240 -XX:-Inline -XX:CompileOnly=Test Test
 */
 
 public class Test extends Thread {
@@ -29,7 +29,7 @@
             System.out.println("KILL THREAD!");
             t.stop();
         }
-        System.exit(0);
+        System.exit(95); // TEST PASS
     }
 
     public void run() {
--- old/compiler/4998314/Test4998313.sh	Mon Jan  5 11:32:35 2009
+++ /dev/null	Mon Jan  5 11:32:35 2009
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-if [ "${TESTSRC}" = "" ]
-then TESTSRC=.
-fi
-
-if [ "${TESTJAVA}" = "" ]
-then
-  PARENT=`dirname \`which java\``
-  TESTJAVA=`dirname ${PARENT}`
-  echo "TESTJAVA not set, selecting " ${TESTJAVA}
-  echo "If this is incorrect, try setting the variable manually."
-fi
-
-if [ "${TESTCLASSES}" = "" ]
-then
-  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
-  exit 1
-fi
-
-BIT_FLAG=""
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
-  SunOS | Linux )
-    NULL=/dev/null
-    PS=":"
-    FS="/"
-    ## for solaris it's HOME
-    FILE_LOCATION=$HOME
-    if [ -f ${FILE_LOCATION}${FS}JDK64BIT -a ${OS} = "SunOS" -a `uname -p`='sparc' ]
-    then
-        BIT_FLAG="-d64"
-    fi
-    ;;
-  Windows_* )
-    NULL=NUL
-    PS=";"
-    FS="\\"
-    ;;
-  * )
-    echo "Unrecognized system!"
-    exit 1;
-    ;;
-esac
-
-JEMMYPATH=${CPAPPEND}
-CLASSPATH=.${PS}${TESTCLASSES} ; export CLASSPATH
-
-JAVA_FLAG="-server -XX:-Inline -XX:CompileOnly=Test"
-
-THIS_DIR=`pwd`
-
-${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} -fullversion
-
-${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} ${JAVA_FLAG} Test > test.out 2>&1
-STATUS=$?
-
-grep "Dumping core" test.out
-GOUT=$?
-
-if [ $STATUS != 0 -o -f "core" -o $GOUT = 0 ]
-then
-    echo "Test Failed"
-    exit 1
-else
-    echo "Test Passed"
-    exit 0
-fi