procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

From-SVN: r70381
This commit is contained in:
Tom Tromey 2003-08-12 17:59:17 +00:00 • committed by Tom Tromey
parent a98c7b2c66
commit 358bfe3df3
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/testsuite/ChangeLog
View file

@ -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> 2003-08-12 Tom Tromey <tromey@redhat.com>
* lib/libjava.exp (libjava_find_lib): Search for .so file first. * lib/libjava.exp (libjava_find_lib): Search for .so file first.

19
libjava/testsuite/libjava.mauve/mauve.exp
View file

@ -167,11 +167,17 @@ proc test_mauve {} {
set link_args [concat [libjava_arguments link] \ set link_args [concat [libjava_arguments link] \
[list "additional_flags=--main=DejaGNUTestHarness"]] [list "additional_flags=--main=DejaGNUTestHarness"]]
if {[string match "*libtool*" $compile_args]} {
set objext lo
} else {
set objext o
}
set ok 1 set ok 1
set objlist {} set objlist {}
foreach base [mauve_find_harness_files] { foreach base [mauve_find_harness_files] {
set file $base.class set file $base.class
set obj $base.o set obj $base.$objext
set x [libjava_prune_warnings \ set x [libjava_prune_warnings \
[target_compile [pwd]/$file $obj object $compile_args]] [target_compile [pwd]/$file $obj object $compile_args]]
if {$x != ""} then { if {$x != ""} then {
@ -194,7 +200,10 @@ proc test_mauve {} {
regsub -all -- / $class . class regsub -all -- / $class . class
set ok 1 set ok 1
set this_olist {}
foreach obj $uses($file) { foreach obj $uses($file) {
set obj [file rootname $obj].$objext
lappend this_olist $obj
if {! [file exists $obj]} then { if {! [file exists $obj]} then {
verbose "compiling $obj for test of $class" verbose "compiling $obj for test of $class"
# The .class file does contain a $, but we can quote it between "'"s. # 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 \ set x [libjava_prune_warnings \
[libjava_tcompile [concat $uses($file) $objlist] \ [libjava_tcompile [concat $this_olist $objlist] \
$Executable executable $link_args]] $Executable executable $link_args]]
if {$x != ""} then { if {$x != ""} then {
set proc_ok 0 set proc_ok 0
@ -325,8 +334,6 @@ proc test_mauve_sim {} {
return 0 return 0
} }
lappend objlist gnu/testlet/DejaGNUTestHarness.o
set proc_ok 1 set proc_ok 1
set Executable DejaGNUTestHarness set Executable DejaGNUTestHarness
foreach file $choices { foreach file $choices {
@ -377,8 +384,8 @@ proc test_mauve_sim {} {
} }
set x [libjava_prune_warnings \ set x [libjava_prune_warnings \
[target_compile gnu/testlet/DejaGNUTestHarness.class \ [target_compile DejaGNUTestHarness.class \
gnu/testlet/DejaGNUTestHarness.o object $compile_args]] DejaGNUTestHarness.o object $compile_args]]
if {$x != ""} then { if {$x != ""} then {
fail "Compile DejaGNUTestHarness.java" fail "Compile DejaGNUTestHarness.java"
set proc_ok 0 set proc_ok 0