libjava.exp: Use libgcj-VERSION.jar, not libgcj-3.1.jar.

2002-04-12  Anthony Green  <green@redhat.com>

	* lib/libjava.exp: Use libgcj-VERSION.jar, not libgcj-3.1.jar.

From-SVN: r53571

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index e07a63bb84a99bf647930d8678ee9d75192d558c..f3110c47550e6a1688a8d817a9aadf5b8b5e014f 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-12  Anthony Green  <green@redhat.com>
+
+       * lib/libjava.exp: Use libgcj-VERSION.jar, not libgcj-3.1.jar.
+
 2002-05-14  Release Manager
 
        * GCC 3.1 Released.

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 4bbd0f0965d06cd4577541f1ffce5c423d591b3a..4d020fb5298980244dcc968f2e34e908b0665ddd 100644 (file)
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -112,6 +112,7 @@ proc libjava_init { args } {
     global TOOL_EXECUTABLE
     global original_ld_library_path
     global env objdir
+    global env gcc_version
     global tool_root_dir
     global libjava_libgcc_s_path
 
@@ -129,6 +130,11 @@ proc libjava_init { args } {
        }
     }
 
+    # Determine the version so we can find the libgcj jar file.
+    set text [eval exec "$GCJ_UNDER_TEST --version 2>@ stdout"]
+    regexp -- "gcj \[^ \]+ (\[^ \]+) .*" $text ignore gcc_version
+    verbose "jar file is libgcj-$gcc_version.jar"
+
     # FIXME: This finds libgcj.spec for the default multilib.
     # If thread models differ between multilibs, this has to be moved
     # to libjava_arguments
@@ -265,6 +271,7 @@ proc libjava_arguments {{mode compile}} {
     global runtests
     global env
     global tool_root_dir
+    global gcc_version
     global libjava_libgcc_s_path
 
     if [info exists LIBJAVA] {
@@ -330,9 +337,9 @@ proc libjava_arguments {{mode compile}} {
     verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
 
     # Set the CLASSPATH environment variable
-    verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj-3.1.jar"
+    verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar"
     global env
-    set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj-3.1.jar"
+    set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar"
 
     if {$mode == "link"} {
        global wrapper_file wrap_compile_flags;