This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
PATCH: minor testsuite cleanup
- From: Jeff Sturm <jsturm at one-point dot com>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 4 Sep 2003 00:12:34 -0400 (EDT)
- Subject: PATCH: minor testsuite cleanup
While poking through the testsuite configuration, it occurred to me that
qthreads doesn't really exist, and libgc/libz are now only convenience
libraries. Removing them here unclutters the output of "runtests -v" a
little bit.
OK?
2003-09-03 Jeff Sturm <jsturm@one-point.com>
* lib/libjava.exp (libjava_arguments): Remove unneeded variables.
(test_libjava_from_source): Likewise.
(test_libjava_from_javac): Likewise.
Index: lib/libjava.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.53
diff -u -r1.53 libjava.exp
--- lib/libjava.exp 19 Aug 2003 19:44:44 -0000 1.53
+++ lib/libjava.exp 4 Sep 2003 04:07:25 -0000
@@ -307,9 +307,6 @@
proc libjava_arguments {{mode compile}} {
global base_dir
global LIBJAVA
- global LIBGC
- global LIBQTHREADS
- global LIBZ
global srcdir subdir objdir
global TOOL_OPTIONS
global GCJ_UNDER_TEST
@@ -326,35 +323,14 @@
set libjava [libjava_find_lib libjava gcj]
}
- if [info exists LIBGC] {
- set libgc $LIBGC;
- } else {
- set libgc [libjava_find_lib boehm-gc gcjgc]
- }
-
- if [info exists LIBQTHREADS] {
- set libqthreads $LIBQTHREADS
- } else {
- set libqthreads [libjava_find_lib qthreads gcjcoop]
- }
-
- if [info exists LIBZ] {
- set libz $LIBZ
- } else {
- set libz [libjava_find_lib zlib zgcj]
- }
-
verbose "using LIBJAVA = $libjava" 2
- verbose "using LIBGC = $libgc" 2
- verbose "using LIBQTHREADS = $libqthreads" 2
- verbose "using LIBZ = $libz" 2
set args ""
# Basically we want to build up a colon separated path list from
# the value of $libjava.
set lpath {}
- foreach dir [list $libjava $libgc $libz] {
+ foreach dir [list $libjava] {
foreach item [split $dir " "] {
switch -glob -- $item {
"-L*" {
@@ -572,8 +548,6 @@
#
proc test_libjava_from_source { options srcfile compile_args inpfile resultfile exec_args } {
global base_dir
- global LIBJAVA
- global LIBGC
global srcdir subdir objdir
global TOOL_OPTIONS
global GCJ_UNDER_TEST
@@ -679,8 +653,6 @@
#
proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile exec_args } {
global base_dir
- global LIBJAVA
- global LIBGC
global srcdir subdir objdir
global TOOL_OPTIONS
global GCJ_UNDER_TEST