diff options
| author | H.J. Lu <hjl@gnu.org> | 2002-08-16 18:19:00 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2002-08-16 11:19:00 -0700 |
| commit | 400639e641126d3582233df36b9216e5cd59e8c8 (patch) | |
| tree | d6bb967ec2a9498b65999df79db308f787311d37 | |
| parent | fdf68669ec920c9530aa1b6b7e8fe31377ea780a (diff) | |
| download | gcc-400639e641126d3582233df36b9216e5cd59e8c8.zip gcc-400639e641126d3582233df36b9216e5cd59e8c8.tar.gz gcc-400639e641126d3582233df36b9216e5cd59e8c8.tar.bz2 | |
libjava.exp (gcc_version): Removed.
2002-08-16 H.J. Lu <hjl@gnu.org>
* lib/libjava.exp (gcc_version): Removed.
(libgcj_jar): New.
(libjava_init): Set libgcj_jar with tcl glob.
(libjava_arguments): Use libgcj_jar.
From-SVN: r56382
| -rw-r--r-- | libjava/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 15 |
2 files changed, 14 insertions, 8 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 2078c59..73bc125 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2002-08-16 H.J. Lu <hjl@gnu.org> + + * lib/libjava.exp (gcc_version): Removed. + (libgcj_jar): New. + (libjava_init): Set libgcj_jar with tcl glob. + (libjava_arguments): Use libgcj_jar. + 2002-07-22 Tom Tromey <tromey@redhat.com> * libjava.compile/zeroexp.java: New file. diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index a55985a..bbac0ea 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -112,7 +112,7 @@ proc libjava_init { args } { global TOOL_EXECUTABLE global original_ld_library_path global env objdir - global env gcc_version + global env libgcj_jar global tool_root_dir global libjava_libgcc_s_path @@ -130,10 +130,9 @@ proc libjava_init { args } { } } - # Determine the version so we can find the libgcj jar file. - set text [eval exec "$GCJ_UNDER_TEST --version 2>@ stdout"] - regexp -- "gcj \[^ \]+ (\[^ \]+) .*" $text ignore gcc_version - verbose "jar file is libgcj-$gcc_version.jar" + # Find the libgcj jar file. + set libgcj_jar [glob $objdir/../libgcj-*.jar] + verbose "jar file is $libgcj_jar" # FIXME: This finds libgcj.spec for the default multilib. # If thread models differ between multilibs, this has to be moved @@ -292,7 +291,7 @@ proc libjava_arguments {{mode compile}} { global runtests global env global tool_root_dir - global gcc_version + global libgcj_jar global libjava_libgcc_s_path if [info exists LIBJAVA] { @@ -358,9 +357,9 @@ proc libjava_arguments {{mode compile}} { verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)" # Set the CLASSPATH environment variable - verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar" + verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$libgcj_jar" global env - set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar" + set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$libgcj_jar" if {$mode == "link"} { global wrapper_file wrap_compile_flags; |