Re: stacktrace vs. StackTrace

[Bryce McKinlay <mckinlay at redhat dot com>]

Geoffrey Keating wrote:
> On a case-insensitive filesystem, this causes 'svn update' to print:
>
> svn: Failed to add file 'StackTrace.out': object of the same name 
> already exists
>
> and the checkout fails.
>
> In order to fix this, I'm about to run the following commands:
>
> svn mv 
> svn+ssh://gcc.gnu.org/svn/gcc/trunk/libjava/testsuite/libjava.lang/{StackTrace,StackTrace2}.out 
>
> svn mv 
> svn+ssh://gcc.gnu.org/svn/gcc/trunk/libjava/testsuite/libjava.lang/{StackTrace,StackTrace2}.java 


Thanks for fixing this, Geoff. I've checked in the following patch to 
update the test case for the new class name.

Bryce

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.

Index: testsuite/libjava.lang/StackTrace2.out
===================================================================
--- testsuite/libjava.lang/StackTrace2.out	(revision 115267)
+++ testsuite/libjava.lang/StackTrace2.out	(working copy)
@@ -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
Index: testsuite/libjava.lang/StackTrace2.java
===================================================================
--- testsuite/libjava.lang/StackTrace2.java	(revision 115267)
+++ testsuite/libjava.lang/StackTrace2.java	(working copy)
@@ -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 @@
   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 @@
     // 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: " +