libjava.exp (bytecompile_file): Don't unset CLASSPATH.

        * lib/libjava.exp (bytecompile_file): Don't unset CLASSPATH.
        (libjava_arguments): Use .jar extension for libgcj.

From-SVN: r39085

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 6f3ca8d01a5ac4c9a94a100e88eec890468baf2f..ab8f5b13ca1d820f5b0b3ccfc8aaa1639aa27177 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-16  Richard Henderson  <rth@redhat.com>
+
+       * lib/libjava.exp (bytecompile_file): Don't unset CLASSPATH.
+       (libjava_arguments): Use .jar extension for libgcj.
+
 2001-01-08  Bryce McKinlay  <bryce@albatross.co.nz>
 
        * libjava.compile/SuperConstr.java: New test case.

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 085fdc2b61875ceb71a9f9bcb2131be23d6c1334..101871e905590ac948f9ec60418c5c5aa35aafbc 100644 (file)
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -82,7 +82,6 @@ proc bytecompile_file { file objdir {classpath {}} } {
     set dirname [file dirname $file]
 
     set javac [find_javac]
-    catch {unset env(CLASSPATH)}
     if {$classpath != ""} then {
         set env(CLASSPATH) $classpath
     }
@@ -253,9 +252,9 @@ proc libjava_arguments {{mode compile}} {
     setenv SHLIB_PATH "$ld_library_path:$original_ld_library_path"
 
     # Set the CLASSPATH environment variable
-    verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj.zip"
+    verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar"
     global env
-    set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj.zip"
+    set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj.jar"
 
     global wrapper_file wrap_compile_flags;
     lappend args "additional_flags=$wrap_compile_flags";