Merged r5525 from trunk:

* tests/regression/clinitexception.2output: Updated to GNU Classpath
0.92.
* tests/regression/extest.2output: Likewise.

--HG--
branch : unified_variables

diff --git a/tests/regression/clinitexception.2output b/tests/regression/clinitexception.2output
index 3c690ab91dbd2a94ef8dd6769806c5b712bbb912..9f6a360789c2a90397494d57d3cbab517090380f 100644 (file)
--- a/tests/regression/clinitexception.2output
+++ b/tests/regression/clinitexception.2output
@@ -1,4 +1,4 @@
 Exception in thread "main" java.lang.ExceptionInInitializerError
    <<No stacktrace available>>
 Caused by: java.lang.RuntimeException
-   at clinitexception.<clinit>(clinitexception.java:3)
+   at clinitexception.<clinit>(clinitexception.java:4)

diff --git a/tests/regression/extest.2output b/tests/regression/extest.2output
index 84a26bd3f1be294eba504bca5a548a8ce7dfdd1f..58cfec85942e5b4239abda880a6d9c2c96f422e8 100644 (file)
--- a/tests/regression/extest.2output
+++ b/tests/regression/extest.2output
@@ -43,11 +43,11 @@ java.lang.ArrayStoreException
    at extest.main(extest.java:144)
 
 ClassCastException:                           OK
-java.lang.ClassCastException
+java.lang.ClassCastException: java/lang/Object
    at extest.main(extest.java:155)
 
 ClassCastException:                           OK
-java.lang.ClassCastException
+java.lang.ClassCastException: java/lang/Object
    at extest.main(extest.java:166)
 
 NegativeArraySizeException (newarray):        OK
@@ -95,7 +95,7 @@ java.lang.ArrayIndexOutOfBoundsException: -559038737
    at extest.main(extest.java:267)
 
 ClassCastException:                           OK
-java.lang.ClassCastException
+java.lang.ClassCastException: java/lang/Object
    at extest.ccesub(extest.java:404)
    at extest.main(extest.java:284)
 
@@ -126,8 +126,7 @@ java.lang.UnsatisfiedLinkError: nsub
 
 NullPointerException (native):                OK
 java.lang.NullPointerException
-   at java.lang.VMSystem.arraycopy(Native Method)
-   at java.lang.System.arraycopy(System.java:251)
+   at java.lang.System.arraycopy(System.java:281)
    at extest.main(extest.java:345)