This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: mauve test suite fix
- From: Tom Tromey <tromey at redhat dot com>
- To: GCC libjava patches <java-patches at gcc dot gnu dot org>
- Date: 12 Aug 2003 11:51:13 -0600
- Subject: Patch: FYI: mauve test suite fix
- Reply-to: tromey at redhat dot com
I'm checking this in on the trunk.
This lets the Mauve tests work for me when --disable-static is in
effect.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* libjava.mauve/mauve.exp (test_mauve_sim): Don't find
DejaGNUTestHarness in gnu/testlet.
(test_mauve): Use correct object extension.
Index: libjava.mauve/mauve.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/libjava.mauve/mauve.exp,v
retrieving revision 1.22
diff -u -r1.22 mauve.exp
--- libjava.mauve/mauve.exp 21 Jul 2003 01:09:47 -0000 1.22
+++ libjava.mauve/mauve.exp 12 Aug 2003 17:54:48 -0000
@@ -167,11 +167,17 @@
set link_args [concat [libjava_arguments link] \
[list "additional_flags=--main=DejaGNUTestHarness"]]
+ if {[string match "*libtool*" $compile_args]} {
+ set objext lo
+ } else {
+ set objext o
+ }
+
set ok 1
set objlist {}
foreach base [mauve_find_harness_files] {
set file $base.class
- set obj $base.o
+ set obj $base.$objext
set x [libjava_prune_warnings \
[target_compile [pwd]/$file $obj object $compile_args]]
if {$x != ""} then {
@@ -194,7 +200,10 @@
regsub -all -- / $class . class
set ok 1
+ set this_olist {}
foreach obj $uses($file) {
+ set obj [file rootname $obj].$objext
+ lappend this_olist $obj
if {! [file exists $obj]} then {
verbose "compiling $obj for test of $class"
# The .class file does contain a $, but we can quote it between "'"s.
@@ -216,7 +225,7 @@
}
set x [libjava_prune_warnings \
- [libjava_tcompile [concat $uses($file) $objlist] \
+ [libjava_tcompile [concat $this_olist $objlist] \
$Executable executable $link_args]]
if {$x != ""} then {
set proc_ok 0
@@ -325,8 +334,6 @@
return 0
}
- lappend objlist gnu/testlet/DejaGNUTestHarness.o
-
set proc_ok 1
set Executable DejaGNUTestHarness
foreach file $choices {
@@ -377,8 +384,8 @@
}
set x [libjava_prune_warnings \
- [target_compile gnu/testlet/DejaGNUTestHarness.class \
- gnu/testlet/DejaGNUTestHarness.o object $compile_args]]
+ [target_compile DejaGNUTestHarness.class \
+ DejaGNUTestHarness.o object $compile_args]]
if {$x != ""} then {
fail "Compile DejaGNUTestHarness.java"
set proc_ok 0