Handle multilibs correctly in libjava

[Andreas Jaeger <aj at suse dot de>]

With multilibs we currently have the problem when running the
testsuite that always the default gij is used, e.g. on Linux/AMD64 the
64-bit x86-64 version.  But the 32-bit gij is not used when running
the 32-bit tests and this results in errors since a 64-bit program
like gij cannot load 32-bit libraries.

The appended patch has been tested on x86_64-linux-gnu with running
the testsuite to test both multilibs using:

RUNTESTFLAGS="--target_board 'unix{-m32,}'" make check

And get now the following excellent results:

                === libjava Summary for unix/-m32 ===

# of expected passes            3706
# of unexpected successes       2
# of expected failures          12
# of untested testcases         12

               === libjava Summary for unix ===

# of expected passes            3706
# of unexpected successes       2
# of expected failures          12
# of untested testcases         12


Ok to commit?

Andreas

2004-12-28  Andreas Jaeger  <aj@suse.de>

	* testsuite/lib/libjava.exp (libjava_find_gij): Handle multilibs.



============================================================
Index: libjava/testsuite/lib/libjava.exp
--- lib/libjava.exp	21 Dec 2004 01:01:06 -0000	1.65
+++ lib/libjava.exp	28 Dec 2004 10:45:05 -0000
@@ -277,10 +277,11 @@ proc libjava_find_spec {} {
 proc libjava_find_gij {} {
     global base_dir objdir
 
-    if {! [file exists $objdir/../gij]} {
+    set gij [lookfor_file [get_multilibs] libjava];
+    if {! [file exists $gij/gij]} {
 	return ""
     }
-    return $objdir/../gij
+    return $gij/gij
 }
 
 # Remove a bunch of files.

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 NÃrnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Attachment: pgp00000.pgp
Description: PGP signature