This is the mail archive of the
java-patches@sources.redhat.com
mailing list for the Java project.
Testsuite patches
- To: "'java-patches at sources dot redhat dot com'" <java-patches at sources dot redhat dot com>
- Subject: Testsuite patches
- From: Anthony Green <green at redhat dot com>
- Date: Fri, 24 Nov 2000 11:45:36 -0800
- Organization: Red Hat, Inc.
- Reply-To: "green at cygnus dot com" <green at cygnus dot com>
This patch contains three changes.
The PR129_B.no-link change is required because it was not designed to be
linked, just compiled. Now that the compiler is fixed, the testcase is still
failing because we didn't tell it not to link.
I tweaked the classpath used by the test harness. I can't explain why it was
working before.
The change that may need discussion is how source->bytecode compilations
default to gcj -C now instead of javac. You can still use javac by setting the
environment variable SUN_JAVAC to "javac". I think defaulting to gcj -C makes
sense now and is long overdue.
Ok to commit?
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.
Index: libjava/testsuite/lib/libjava.exp
===================================================================
RCS file: /cvs/java/libgcj/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.18
diff -u -p -r1.18 libjava.exp
--- libjava.exp 2000/11/06 00:22:01 1.18
+++ libjava.exp 2000/11/24 19:26:59
@@ -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 {cla
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";
Index: libjava/testsuite/libjava.compile/PR129_B.no-link
===================================================================
RCS file: PR129_B.no-link
diff -N PR129_B.no-link
--- /dev/null Tue May 5 13:32:27 1998
+++ PR129_B.no-link Fri Nov 24 11:26:59 2000
@@ -0,0 +1 @@
+Don't link me