aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/testsuite/ChangeLog3
-rw-r--r--libjava/testsuite/lib/libjava.exp5
2 files changed, 6 insertions, 2 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index d7fe22c..feff365 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,5 +1,8 @@
1999-06-25 Tom Tromey <tromey@cygnus.com>
+ * lib/libjava.exp (test_libjava_from_javac): Fixed typo. Always
+ make class_files a list.
+
* lib/libjava.exp (test_libjava_from_javac): Prepend `$objdir/' to
class file names.
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 88380d1..8c95fb3 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -366,12 +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 $objdir/[file rootname [file tail $srcfile]].class
+ set class_files \
+ [list $objdir/[file rootname [file tail $srcfile]].class]
} else {
# Turn "a b" into "a.class b.class".
set class_files {}
foreach file [split [string trim $class_out]] {
- lappend class_out $objdir/$file.class
+ lappend class_files $objdir/$file.class
}
}