mauve.exp (test_mauve_sim): Don't find DejaGNUTestHarness in gnu/testlet.

	* libjava.mauve/mauve.exp (test_mauve_sim): Don't find
	DejaGNUTestHarness in gnu/testlet.
	(test_mauve): Use correct object extension.

From-SVN: r70381

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 05d1874bf7b993cd6e4c0083b0c9c34cf569f21d..c19cfb0e7899fdf3bf7e361ed02ebcd4fff72373 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-12  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.
+
 2003-08-12  Tom Tromey  <tromey@redhat.com>
 
        * lib/libjava.exp (libjava_find_lib): Search for .so file first.

diff --git a/libjava/testsuite/libjava.mauve/mauve.exp b/libjava/testsuite/libjava.mauve/mauve.exp
index 4ef1a104fd29fe744d19d182141f0e5123023527..03bbed9fd9facc238604dd2b25c8437d19bda471 100644 (file)
--- a/libjava/testsuite/libjava.mauve/mauve.exp
+++ b/libjava/testsuite/libjava.mauve/mauve.exp
@@ -167,11 +167,17 @@ proc test_mauve {} {
   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 @@ proc test_mauve {} {
     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 @@ proc test_mauve {} {
     }
 
     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 @@ proc test_mauve_sim {} {
     return 0
   }
 
-  lappend objlist gnu/testlet/DejaGNUTestHarness.o
-
   set proc_ok 1
   set Executable DejaGNUTestHarness
   foreach file $choices {
@@ -377,8 +384,8 @@ proc test_mauve_sim {} {
     }
 
     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