diff options
Diffstat (limited to 'libjava/testsuite')
| -rw-r--r-- | libjava/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 47e493d2c00..d7fe22c39dd 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,8 @@ +1999-06-25 Tom Tromey <tromey@cygnus.com> + + * lib/libjava.exp (test_libjava_from_javac): Prepend `$objdir/' to + class file names. + 1999-06-24 Tom Tromey <tromey@cygnus.com> * lib/libjava.exp (libjava_arguments): If `libtool' not found in diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 78818fc3715..88380d14b74 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -366,10 +366,13 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e # nothing if the file contains an interface and not a class. I # believe this is a jv-scan bug. if {$class_out == ""} then { - set class_files [file rootname [file tail $srcfile]].class + set class_files $objdir/[file rootname [file tail $srcfile]].class } else { # Turn "a b" into "a.class b.class". - set class_files [join [split [string trim $class_out]] ".class "].class + set class_files {} + foreach file [split [string trim $class_out]] { + lappend class_out $objdir/$file.class + } } # Usually it is an error for a test program not to have a `main' |