From 112250b1d476e9bef82a9cfea906e4a4adc60e25 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 25 Jun 1999 13:55:59 +0000
Subject: [PATCH] * lib/libjava.exp (test_libjava_from_javac): Prepend
`$objdir/' to class file names.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27771 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/testsuite/ChangeLog | 5 +++++
libjava/testsuite/lib/libjava.exp | 7 +++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 47e493d2c00c..d7fe22c39ddc 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 78818fc37158..88380d14b741 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'
--
GitLab