This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
PATCH: Re: libjava testsuite: get_multilibs fails
- From: Bryce McKinlay <mckinlay at redhat dot com>
- To: tromey at redhat dot com
- Cc: Andreas Jaeger <aj at suse dot de>, Aaron Luchko <aluchko at redhat dot com>, java-patches at gcc dot gnu dot org
- Date: Fri, 22 Apr 2005 15:34:09 -0400
- Subject: PATCH: Re: libjava testsuite: get_multilibs fails
- References: <42691D68.2090509@redhat.com> <m3fyxiwsxa.fsf@localhost.localdomain>
Tom Tromey wrote:
Bryce> Does anyone know why Dejagnu's get_multilibs fails in some cases? It
Bryce> always seems to work for me but fails (returning an empty string) for
Bryce> someone else with a seemingly similar-configured GCC, causing
Bryce> libjava_find_gij to fail and hence not run the gij tests.
It failed for me too. I wonder if it depends on dejagnu version.
I don't think its the dejagnu version, but rather something to do with
the way GCC is configured. A built tree copied from Aaron's machine to
mine also failed, but we couldn't see any obvious differences in the
configure command.
Perhaps we could work around the case where it is empty.
Yeah, I'm going to check in this patch.
Bryce
2005-04-22 Bryce McKinlay <mckinlay@redhat.com>
* testsuite/lib/libjava.exp (libjava_find_gij): Use $objdir/.. to find
gij if get_multilibs fails.
--- lib/libjava.exp 11 Mar 2005 21:33:56 -0000 1.67
+++ lib/libjava.exp 22 Apr 2005 19:32:03 -0000
@@ -278,6 +278,10 @@
global base_dir objdir
set gijdir [lookfor_file [get_multilibs] libjava];
+ # Fall back if get_multilibs fails.
+ if {$gijdir == ""} {
+ set gijdir "$objdir/.."
+ }
if {! [file exists $gijdir/gij]} {
return ""
}