Commit 6b8c5489 by Tom Tromey Committed by Tom Tromey

re PR libgcj/9139 (mauve tests require installation)

	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
parent 8fa1ad0e
2003-01-12 Tom Tromey <tromey@redhat.com>
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.
2003-01-03 Tom Tromey <tromey@redhat.com> 2003-01-03 Tom Tromey <tromey@redhat.com>
* libjava.compile/pr8712.java: New file, for PR java/8712. * libjava.compile/pr8712.java: New file, for PR java/8712.
......
# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation
load_lib "libgloss.exp" load_lib "libgloss.exp"
...@@ -74,7 +74,7 @@ proc find_gcjh {} { ...@@ -74,7 +74,7 @@ proc find_gcjh {} {
} }
proc find_javac {} { proc find_javac {} {
global SUN_JAVAC GCJ_UNDER_TEST env global SUN_JAVAC GCJ_UNDER_TEST env libgcj_jar
# If JDK doesn't run on your platform but some other # If JDK doesn't run on your platform but some other
# JDK-compatible javac does, you may set SUN_JAVAC to point to it. # JDK-compatible javac does, you may set SUN_JAVAC to point to it.
# One of the most important properties of a SUN_JAVAC is that it # One of the most important properties of a SUN_JAVAC is that it
...@@ -87,7 +87,7 @@ proc find_javac {} { ...@@ -87,7 +87,7 @@ proc find_javac {} {
if {[info exists env(SUN_JAVAC)]} { if {[info exists env(SUN_JAVAC)]} {
set SUN_JAVAC $env(SUN_JAVAC) set SUN_JAVAC $env(SUN_JAVAC)
} else { } else {
set SUN_JAVAC "$GCJ_UNDER_TEST -C" set SUN_JAVAC "$GCJ_UNDER_TEST -C -I$libgcj_jar"
} }
} }
return $SUN_JAVAC return $SUN_JAVAC
......
# 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>. # Written by Tom Tromey <tromey@cygnus.com>.
# Incorporate Mauve into libjava's DejaGNU test suite framework. # Incorporate Mauve into libjava's DejaGNU test suite framework.
...@@ -86,25 +86,25 @@ proc test_mauve {} { ...@@ -86,25 +86,25 @@ proc test_mauve {} {
set full_srcdir [pwd] set full_srcdir [pwd]
cd $here/mauve-build cd $here/mauve-build
global env global env libgcj_jar
global GCJ_UNDER_TEST global GCJ_UNDER_TEST
global TOOL_EXECUTABLE global TOOL_EXECUTABLE
if ![info exists GCJ_UNDER_TEST] { if ![info exists GCJ_UNDER_TEST] {
if [info exists TOOL_EXECUTABLE] { if [info exists TOOL_EXECUTABLE] {
set GCJ_UNDER_TEST $TOOL_EXECUTABLE; set GCJ_UNDER_TEST $TOOL_EXECUTABLE;
} else { } else {
if [info exists env(GCJ)] { if [info exists env(GCJ)] {
set GCJ_UNDER_TEST env(GCJ) set GCJ_UNDER_TEST env(GCJ)
} else { } else {
set GCJ_UNDER_TEST "[find_gcj]" set GCJ_UNDER_TEST "[find_gcj]"
} }
}
} }
}
# Append -B and -I so that libgcj.spec and libgcj.zip are found # Append -B and -I so that libgcj.spec and libgcj.jar are found
# before they're installed. # before they're installed.
set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$objdir/../libgcj.jar" set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$libgcj_jar"
if {[catch { if {[catch {
system "$env(MAUVEDIR)/configure --with-gcj 2>&1" system "$env(MAUVEDIR)/configure --with-gcj 2>&1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment