StackTrace2.java: Renamed from StackTrace.java.

2006-07-07  Bryce McKinlay  <mckinlay@redhat.com>
            Geoffrey Keating <geoffk@apple.com>

        * testsuite/libjava.lang/StackTrace2.java: Renamed from
        StackTrace.java. Changed class name.
        * testsuite/libjava.lang/StackTrace2.out: Renamed from
        StackTrace.out. Updated for new class name.

Co-Authored-By: Geoffrey Keating <geoffk@apple.com>
From-SVN: r115268

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 929da9468c387d06e18cba8502327691423ae822..86c0842008304485a401858c4cc2f31d9d671590 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-07  Bryce McKinlay  <mckinlay@redhat.com>
+           Geoffrey Keating <geoffk@apple.com>
+
+       * testsuite/libjava.lang/StackTrace2.java: Renamed from
+       StackTrace.java. Changed class name.
+       * testsuite/libjava.lang/StackTrace2.out: Renamed from
+       StackTrace.out. Updated for new class name.
+
 2006-07-07  Ranjit Mathew  <rmathew@gcc.gnu.org>
 
        * sysdep/i386/backtrace.h (fallback_backtrace): Scan for a function's

diff --git a/libjava/testsuite/libjava.lang/StackTrace2.java b/libjava/testsuite/libjava.lang/StackTrace2.java
index b16e297d90b7fd535b59f6330e69d1e5cb374c5a..e06db0cc992f658bc81c78e12aea1cc94b748045 100644 (file)
--- a/libjava/testsuite/libjava.lang/StackTrace2.java
+++ b/libjava/testsuite/libjava.lang/StackTrace2.java
@@ -1,7 +1,7 @@
 // Check that stack trace's work, and stack trace line numbers, if available,
 // are correct.
 
-public class StackTrace
+public class StackTrace2
 {
   public static void main(String[] args) 
   { 
@@ -37,10 +37,10 @@ public class StackTrace
   static void checkTrace(StackTraceElement[] trace)
   {
     System.out.println("Trace length = " + trace.length);
-    checkLine(trace[0], "StackTrace$Inner", "doCrash", 33);
-    checkLine(trace[1], "StackTrace$Inner", "<init>", 28);
-    checkLine(trace[2], "StackTrace", "a", 21);
-    checkLine(trace[3], "StackTrace", "main", 10);
+    checkLine(trace[0], "StackTrace2$Inner", "doCrash", 33);
+    checkLine(trace[1], "StackTrace2$Inner", "<init>", 28);
+    checkLine(trace[2], "StackTrace2", "a", 21);
+    checkLine(trace[3], "StackTrace2", "main", 10);
   }
   
   static void checkLine(StackTraceElement frame, String expected_cl, 
@@ -67,7 +67,7 @@ public class StackTrace
     // for stack traces, or when no debug info is available.
     if (frame.getLineNumber() < 0
         || (frame.getLineNumber() == expected_line
-            && frame.getFileName().equals("StackTrace.java")))
+            && frame.getFileName().equals("StackTrace2.java")))
       System.out.println("OK");
     else
       System.out.println("FAIL - expected " + expected_line + ", got: " +

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