2004-05-10 Andreas Tobler <a.tobler@schweiz.ch>

	* testsuite/lib/libjava.exp (libjava_invoke): Add new argument
	ld_library_additions. Adjust all calls to libjava_invoke to match
	the new argument.

	* testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Pass stdc++
	path to cxxflagslist.
	Pass path of libstdc++ to libjava_invoke.

	* testsuite/libjava.jar/jar.exp (gcj_jar_inerpret): Adjust
	libjava_invoke arguments.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81679 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 10 insertions, 5 deletions

diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 5ca07abb07d..b1f6d4e34f4 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -126,6 +126,9 @@ proc gcj_jni_test_one {file} {
 	}
       }
       lappend cxxflaglist $arg
+      # In case the libstdc++ is not installed yet, we pass the build
+      # directory of it to the cxxflaglist.
+      lappend cxxflaglist "-L$cxxldlibflags"
     }
 
     lappend cxxflaglist "-lstdc++"
@@ -149,17 +152,19 @@ proc gcj_jni_test_one {file} {
     # FIXME
     return 0
   }
-  
+
   # We purposely ignore errors here; we still want to run the other
   # appropriate tests.
   set errname [file rootname [file tail $file]]
   set gij [libjava_find_gij]
   # libjava_find_gij will return `gij' if it couldn't find the
   # program; in this case we want to skip the test.
-  if {$INTERPRETER == "yes" && $gij != "gij"} {
-      libjava_invoke $errname "gij test" opts $gij \
-	"" $resultfile $main
-  }  
+  # If the libraries are not installed yet, we have to pass them via
+  # cxxldlibflags to libjava_invoke.
+    if {$INTERPRETER == "yes" && $gij != "gij"} {
+	libjava_invoke $errname "gij test" opts $gij \
+	    "" $resultfile $cxxldlibflags $main
+  }
 
   # When we succeed we remove all our clutter.
   eval gcj_cleanup [glob -nocomplain -- ${main}.*] [list $main lib${main}.${so_extension}]