throwit.out: Fixed output to be correct.

	* libjava.jni/throwit.out: Fixed output to be correct.

	* libjava.jni/noclass.java (main): `find_it' throws an exception.

From-SVN: r33291

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 6e7897bdc2f90a9e1b6f2f3a8bda9c270981599e..058f9ab90eb761067c1cf926be12004e8b3c9cab 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-20  Tom Tromey  <tromey@cygnus.com>
+
+       * libjava.jni/throwit.out: Fixed output to be correct.
+
+       * libjava.jni/noclass.java (main): `find_it' throws an exception.
+
 2000-04-16  Anthony Green  <green@redhat.com>
 
        * libjava.compile/PR209.java: New file.

diff --git a/libjava/testsuite/libjava.jni/noclass.java b/libjava/testsuite/libjava.jni/noclass.java
index cfa1178f03ca64864af3db87db77bd43860a11e4..7e0b8c34ccac070f3b847521b742a67fd85f05d3 100644 (file)
--- a/libjava/testsuite/libjava.jni/noclass.java
+++ b/libjava/testsuite/libjava.jni/noclass.java
@@ -11,8 +11,15 @@ public class noclass
 
   public static void main (String[] args)
   {
-    find_it ();
-    // If find_it() causes a crash, we won't be running this next line.
-    System.out.println ("Ok");
+    try
+      {
+       find_it ();
+      }
+    catch (Throwable _)
+      {
+       // If find_it() causes a crash, or doesn't throw an exception,
+       // we won't be running this next line.
+       System.out.println ("Ok");
+      }
   }
 }

diff --git a/libjava/testsuite/libjava.jni/throwit.out b/libjava/testsuite/libjava.jni/throwit.out
index 8c75e99fcbd4ac6c24687d152eaf6d9e278bf55d..c50b7a9abbc105a34fe8e4e4b826a09a4cac4686 100644 (file)
--- a/libjava/testsuite/libjava.jni/throwit.out
+++ b/libjava/testsuite/libjava.jni/throwit.out
@@ -1,4 +1,4 @@
 class java.lang.UnknownError
-the word is zardoz
-class java.lang.Throwable
 zardoz is the word
+class java.lang.Throwable
+the word is zardoz