This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Mauve harness failure on s390


Hi,

On Fri, 2003-01-31 at 17:06, Tom Tromey wrote:
> Yeah, it is hard to do the pruning correctly.  I still wish we'd put
> in a new gcj flag instead.
> 
> This is on my list of things to fix in the near future.  But if
> someone else wants to fix it, feel free.

How does this look.

2003-01-31  Mark Wielaard  <mark@klomp.org>
                                                                                
        * lib/libjava.exp (libjava_prune_warnings): Remove all unreachable
        bytecode warnings.

OK for branch and mainline?

Cheers,

Mark
Index: lib/libjava.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.47
diff -u -r1.47 libjava.exp
--- lib/libjava.exp	13 Jan 2003 00:22:19 -0000	1.47
+++ lib/libjava.exp	31 Jan 2003 16:45:04 -0000
@@ -18,9 +18,15 @@
     set len [llength $tlist]
     for {set i [expr {$len - 1}]} {$i >= 2} {incr i -1} {
 	if {[string match "*unreachable bytecode*" [lindex $tlist $i]]} {
-	    # Delete this line and the previous two lines.
-	    set tlist [lreplace $tlist [expr {$i - 2}] $i]
-	    incr i -2
+	    # Delete this line, all other unreachable warnings and the previous
+	    # two lines containing the method and class.
+	    set j [expr {$i - 1}]
+	    while {[string match "*unreachable bytecode*" [lindex $tlist $j]]} {
+		incr j -1
+	    }
+	    incr j -1
+	    set tlist [lreplace $tlist $j $i]
+	    set i $j
 	}
     }
     return [join $tlist \n]

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]