StackTrace2.java: Rewrite to prevent spurious failure when some methods are inlined.

2008-08-07  Andrew Haley  <aph@redhat.com>

	* testsuite/libjava.lang/StackTrace2.java: Rewrite to prevent
	spurious failure when some methods are inlined.

From-SVN: r138840

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f9b879330ef8d762c8c042cd0afe30819b20561c..891b4dca5889ae0d2b3a5a846f6ffcafb1813418 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-07  Andrew Haley  <aph@redhat.com>
+
+       * testsuite/libjava.lang/StackTrace2.java: Rewrite to prevent
+       spurious failure when some methods are inlined.
+
 2008-08-05  Matthias Klose  <doko@ubuntu.com>
 
        * HACKING: Update instructions how to build gcj/javaprims.h.

diff --git a/libjava/testsuite/libjava.lang/StackTrace2.jar b/libjava/testsuite/libjava.lang/StackTrace2.jar
index edb8f0e2e743116ca28474b22300272e9b003ac8..0aacb8fa6446bac54feda21dea5d1dcfadc80707 100644 (file)
Binary files a/libjava/testsuite/libjava.lang/StackTrace2.jar and b/libjava/testsuite/libjava.lang/StackTrace2.jar differ

diff --git a/libjava/testsuite/libjava.lang/StackTrace2.java b/libjava/testsuite/libjava.lang/StackTrace2.java
index 4a69409815eca4464bd7822508c6502b3daccc99..01c7d5bac7ff35aa5c65cf436b3d932c75fd25e9 100644 (file)
--- a/libjava/testsuite/libjava.lang/StackTrace2.java
+++ b/libjava/testsuite/libjava.lang/StackTrace2.java
@@ -7,7 +7,7 @@ public class StackTrace2
   { 
     try
     {
-      a();
+      new StackTrace2().a();
     }
     catch (Exception x)
     {
@@ -16,14 +16,14 @@ public class StackTrace2
     }
   }
 
-  static void a() 
+  void a() 
   { 
-    new Inner();
+    new Inner().foo();
   }
   
-  static class Inner
+  class Inner
   {
-    public Inner()
+    public void foo()
     {
       doCrash(null);
     }  
@@ -38,7 +38,7 @@ public class StackTrace2
   {
     System.out.println("Trace length = " + trace.length);
     checkLine(trace[0], "StackTrace2$Inner", "doCrash", 33);
-    checkLine(trace[1], "StackTrace2$Inner", "<init>", 28);
+    checkLine(trace[1], "StackTrace2$Inner", "foo", 28);
     checkLine(trace[2], "StackTrace2", "a", 21);
     checkLine(trace[3], "StackTrace2", "main", 10);
   }

diff --git a/libjava/testsuite/libjava.lang/StackTrace2.out b/libjava/testsuite/libjava.lang/StackTrace2.out
index 90cfd48d91f18b78e19aebbb33d735ee8694327f..dafadce812b51f74ec48a6921e8061531a98358d 100644 (file)
--- a/libjava/testsuite/libjava.lang/StackTrace2.out
+++ b/libjava/testsuite/libjava.lang/StackTrace2.out
@@ -1,5 +1,5 @@
 Trace length = 4
 StackTrace2$Inner.doCrash:OK
-StackTrace2$Inner.<init>:OK
+StackTrace2$Inner.foo:OK
 StackTrace2.a:OK
 StackTrace2.main:OK