stacktrace vs. StackTrace

stacktrace vs. StackTrace

[Geoffrey Keating]

[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]

A recent checkin,

------------------------------------------------------------------------
r115235 | bryce | 2006-07-06 16:26:24 -0700 (Thu, 06 Jul 2006) | 9 lines

2006-07-06  Bryce McKinlay <mckinlay@redhat.com>

         * stacktrace.cc (ClassForFrame): Remove commented-out code.
         (UnwindTraceFn): Use _Unwind_GetIPInfo and adjust IP
         only when needed.
         (getLineNumberForFrame): Don't adjust IP here.
         * testsuite/libjava.lang/StackTrace.java: New test case.
         * testsuite/libjava.lang/StackTrace.out: Ditto.


added new files 'StackTrace.java' and 'StackTrace.out' even though  
there was already 'stacktrace.java' and 'stacktrace.out'.

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

and then probably I'll need to edit StackTrace2.java and/or  
StackTrace2.out; I'll send a followup e-mail with that patch.

I can't test this in advance because that would involve having a  
checked-out tree, so there may be some temporary breakage.   
Fortunately it should only affect the testsuite.

[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 2408 bytes --]

Re: stacktrace vs. StackTrace

[Michael Koch]

On Fri, Jul 07, 2006 at 11:48:36AM -0700, Geoffrey Keating wrote:
> A recent checkin,
> 
> ------------------------------------------------------------------------
> r115235 | bryce | 2006-07-06 16:26:24 -0700 (Thu, 06 Jul 2006) | 9 lines
> 
> 2006-07-06  Bryce McKinlay <mckinlay@redhat.com>
> 
>         * stacktrace.cc (ClassForFrame): Remove commented-out code.
>         (UnwindTraceFn): Use _Unwind_GetIPInfo and adjust IP
>         only when needed.
>         (getLineNumberForFrame): Don't adjust IP here.
>         * testsuite/libjava.lang/StackTrace.java: New test case.
>         * testsuite/libjava.lang/StackTrace.out: Ditto.
> 
> 
> added new files 'StackTrace.java' and 'StackTrace.out' even though  
> there was already 'stacktrace.java' and 'stacktrace.out'.
> 
> 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
> 
> and then probably I'll need to edit StackTrace2.java and/or  
> StackTrace2.out; I'll send a followup e-mail with that patch.
> 
> I can't test this in advance because that would involve having a  
> checked-out tree, so there may be some temporary breakage.   
> Fortunately it should only affect the testsuite.

Waht about "svn copy ...", editing the files, testing, "svn remove ..."?


Cheers,
Michael
-- 
http://www.worldforge.org/

Re: stacktrace vs. StackTrace

[Geoffrey Keating]

[-- Attachment #1: Type: text/plain, Size: 1832 bytes --]


On 07/07/2006, at 11:58 AM, Michael Koch wrote:

> On Fri, Jul 07, 2006 at 11:48:36AM -0700, Geoffrey Keating wrote:
>> A recent checkin,
>>
>> --------------------------------------------------------------------- 
>> ---
>> r115235 | bryce | 2006-07-06 16:26:24 -0700 (Thu, 06 Jul 2006) | 9  
>> lines
>>
>> 2006-07-06  Bryce McKinlay <mckinlay@redhat.com>
>>
>>         * stacktrace.cc (ClassForFrame): Remove commented-out code.
>>         (UnwindTraceFn): Use _Unwind_GetIPInfo and adjust IP
>>         only when needed.
>>         (getLineNumberForFrame): Don't adjust IP here.
>>         * testsuite/libjava.lang/StackTrace.java: New test case.
>>         * testsuite/libjava.lang/StackTrace.out: Ditto.
>>
>>
>> added new files 'StackTrace.java' and 'StackTrace.out' even though
>> there was already 'stacktrace.java' and 'stacktrace.out'.
>>
>> 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
>>
>> and then probably I'll need to edit StackTrace2.java and/or
>> StackTrace2.out; I'll send a followup e-mail with that patch.
>>
>> I can't test this in advance because that would involve having a
>> checked-out tree, so there may be some temporary breakage.
>> Fortunately it should only affect the testsuite.
>
> Waht about "svn copy ...", editing the files, testing, "svn  
> remove ..."?

The tricky part there is "testing".  Without a self-consistent  
checkout, it would surely fail.


[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 2408 bytes --]

Re: stacktrace vs. StackTrace

[Bryce McKinlay]

[-- Attachment #1: Type: text/plain, Size: 629 bytes --]

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


[-- Attachment #2: libjava-testsuite-stacktrace2.patch --]
[-- Type: text/x-patch, Size: 2315 bytes --]

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: " +