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, inner classes and dejagnu magic


On Fri, 2003-02-14 at 20:33, Tom Tromey wrote:
> >>>>> "Mark" == Mark Wielaard <mark@klomp.org> writes:
> 
> Mark> Something similar should be possible for the PR1343 case. I will
> Mark> see if I can come up with a patch.
> 
> That would be excellent.

OK. The same trick works here:

2003-02-14  Mark Wielaard  <mark@klomp.org>
                                                                                
        * lib/libjava.exp (test_libjava_from_javac): Don't create .o files
        containing $ characters and always quote class files with "'"s.

With this the PR1343 compile failures are finally gone.
I am installing it on mainline and branch.

Cheers,

Mark
Index: lib/libjava.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.46.2.2
diff -u -r1.46.2.2 libjava.exp
--- lib/libjava.exp	31 Jan 2003 18:09:09 -0000	1.46.2.2
+++ lib/libjava.exp	14 Feb 2003 21:52:32 -0000
@@ -787,8 +787,10 @@
     if {$mode == "compile"} {
 	foreach c_file $class_files {
 	    set executable [file rootname [file tail $c_file]].o
+	    # Don't write files which contain $ chars.
+	    set executable [string map {$ ^} $executable]
 	    set x [libjava_prune_warnings \
-		     [libjava_tcompile $c_file "$executable" $type $args]]
+		     [libjava_tcompile '$c_file' "$executable" $type $args]]
 	    lappend removeList $executable
 	    if {$x != ""} {
 		break

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