diff options
| -rw-r--r-- | libjava/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 7 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.compile/PR129_B.no-link | 1 |
3 files changed, 13 insertions, 3 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index c0ec96b..6727b1e 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,11 @@ +Fri Nov 24 11:25:20 2000 Anthony Green <green@redhat.com> + + * lib/libjava.exp (bytecompile_file): Change default from javac to + gcj -C. + (libjava_arguments): Fix classpath. + + * libjava.compile/PR129_B.no-link: New file. + 2000-11-24 Tom Tromey <tromey@cygnus.com> * libjava.compile/PR375.java: New file. For PR gcj/375. diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 0fd48d8..3031366 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -49,6 +49,7 @@ proc find_gcjh {} { proc bytecompile_file { file objdir {classpath {}} } { global env global SUN_JAVAC + global GCJ_UNDER_TEST set dirname [file dirname $file] # If JDK doesn't run on your platform but some other @@ -63,7 +64,7 @@ proc bytecompile_file { file objdir {classpath {}} } { if [info exists env(SUN_JAVAC)] { set SUN_JAVAC $env(SUN_JAVAC) } else { - set SUN_JAVAC "javac" + set SUN_JAVAC "$GCJ_UNDER_TEST -C" } } @@ -240,9 +241,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.zip" global env - set env(CLASSPATH) ".:$srcdir/$subdir:$objdir/..:$objdir/../libgcj.zip" + set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj.zip" global wrapper_file wrap_compile_flags; lappend args "additional_flags=$wrap_compile_flags"; diff --git a/libjava/testsuite/libjava.compile/PR129_B.no-link b/libjava/testsuite/libjava.compile/PR129_B.no-link new file mode 100644 index 0000000..e69cdec --- /dev/null +++ b/libjava/testsuite/libjava.compile/PR129_B.no-link @@ -0,0 +1 @@ +Don't link me |