From 6b8c5489303211e54834e85eb0c5fdc5d90e813a Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Mon, 13 Jan 2003 00:22:20 +0000
Subject: 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
---
 libjava/testsuite/libjava.mauve/mauve.exp | 34 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'libjava/testsuite/libjava.mauve/mauve.exp')

diff --git a/libjava/testsuite/libjava.mauve/mauve.exp b/libjava/testsuite/libjava.mauve/mauve.exp
index 1ca2884..ce4b0ce 100644
--- a/libjava/testsuite/libjava.mauve/mauve.exp
+++ b/libjava/testsuite/libjava.mauve/mauve.exp
@@ -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"
-- 
cgit v1.1