OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libjava.exp (libjava_init): Look for libgcj-$version.jar instead of libgcj-*.jar.

Browse Source 
2006-07-04  Andreas Tobler  <a.tobler@schweiz.ch>

	* testsuite/lib/libjava.exp (libjava_init): Look for libgcj-$version.jar
	instead of libgcj-*.jar.

From-SVN: r115181
This commit is contained in:
Andreas Tobler 2006-07-04 21:11:20 +02:00 committed by Andreas Tobler
parent 56d30bd5c8
commit 6215885d43
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2006-07-04 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/lib/libjava.exp (libjava_init): Look for libgcj-$version.jar
instead of libgcj-*.jar.
2006-07-04 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/28244:

10
libjava/testsuite/lib/libjava.exp
View File

@ -144,6 +144,7 @@ proc libjava_init { args } {
global tool_root_dir
global libjava_libgcc_s_path
global target_triplet
global libjava_version
# We set LC_ALL and LANG to C so that we get the same error messages as expected.
setenv LC_ALL C
@ -164,7 +165,14 @@ proc libjava_init { args } {
}
# Find the libgcj jar file.
set libgcj_jar [glob $objdir/../libgcj-*.jar]
set tmp [eval exec "$GCJ_UNDER_TEST -v 2>@ stdout"]
regexp " version \[^\n\r\]*" $tmp version
set libjava_version [lindex $version 1]
verbose "version: $libjava_version"
set libgcj_jar [glob $objdir/../libgcj-$libjava_version.jar]
verbose "jar file is $libgcj_jar"
# FIXME: This finds libgcj.spec for the default multilib.