FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/9139 (mauve tests require installation)

Browse source 
Fix for PR libgcj/9139:
	* lib/libjava.exp (find_javac): Put value of libgcj_jar into
	return value when gcj is used.
	* libjava.mauve/mauve.exp (test_mauve): Use libgcj_jar global.

From-SVN: r61237
This commit is contained in:
Tom Tromey 2003-01-13 00:22:20 +00:00 • committed by Tom Tromey
parent 8fa1ad0e6a
commit 6b8c548930
3 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libjava/testsuite/libjava.mauve/mauve.exp
View file

@ -1,4 +1,4 @@
# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation.
# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation.
# Written by Tom Tromey <tromey@cygnus.com>.
# Incorporate Mauve into libjava's DejaGNU test suite framework.
@ -86,25 +86,25 @@ proc test_mauve {} {
set full_srcdir [pwd]
cd $here/mauve-build
global env
global GCJ_UNDER_TEST
global TOOL_EXECUTABLE
global env libgcj_jar
global GCJ_UNDER_TEST
global TOOL_EXECUTABLE
if ![info exists GCJ_UNDER_TEST] {
if [info exists TOOL_EXECUTABLE] {
set GCJ_UNDER_TEST $TOOL_EXECUTABLE;
} else {
if [info exists env(GCJ)] {
set GCJ_UNDER_TEST env(GCJ)
} else {
set GCJ_UNDER_TEST "[find_gcj]"
}
}
if ![info exists GCJ_UNDER_TEST] {
if [info exists TOOL_EXECUTABLE] {
set GCJ_UNDER_TEST $TOOL_EXECUTABLE;
} else {
if [info exists env(GCJ)] {
set GCJ_UNDER_TEST env(GCJ)
} else {
set GCJ_UNDER_TEST "[find_gcj]"
}
}
}
# Append -B and -I so that libgcj.spec and libgcj.zip are found
# before they're installed.
set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$objdir/../libgcj.jar"
# Append -B and -I so that libgcj.spec and libgcj.jar are found
# before they're installed.
set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$libgcj_jar"
if {[catch {
system "$env(MAUVEDIR)/configure --with-gcj 2>&1"