From c99a2d31378c6ad32f86dbeb14b5cbb47942fc2a Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 16 Jan 2001 22:45:40 -0800 Subject: [PATCH] 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 --- libjava/testsuite/ChangeLog | 5 +++++ libjava/testsuite/lib/libjava.exp | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 6f3ca8d01a5..ab8f5b13ca1 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2001-01-16 Richard Henderson + + * lib/libjava.exp (bytecompile_file): Don't unset CLASSPATH. + (libjava_arguments): Use .jar extension for libgcj. + 2001-01-08 Bryce McKinlay * libjava.compile/SuperConstr.java: New test case. diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 085fdc2b618..101871e9055 100644 --- 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"; -- 2.30.2