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

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@138840 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f9b8793..891b4dc 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.
 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 edb8f0e..0aacb8f 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 4a69409..01c7d5b 100644 (file)
--- a/libjava/testsuite/libjava.lang/StackTrace2.java
+++ b/libjava/testsuite/libjava.lang/StackTrace2.java
@@ -7,7 +7,7 @@ public class StackTrace2
   { 
     try
     {
   { 
     try
     {

-      a();
+      new StackTrace2().a();

     }
     catch (Exception x)
     {
     }
     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);
     }  
     {
       doCrash(null);
     }  


@@ -38,7 +38,7 @@ public class StackTrace2
   {
     System.out.println("Trace length = " + trace.length);
     checkLine(trace[0], "StackTrace2$Inner", "doCrash", 33);
   {
     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);
   }
     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 90cfd48..dafadce 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
 Trace length = 4
 StackTrace2$Inner.doCrash:OK

-StackTrace2$Inner.<init>:OK
+StackTrace2$Inner.foo:OK

 StackTrace2.a:OK
 StackTrace2.main:OK
 StackTrace2.a:OK
 StackTrace2.main:OK