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

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index e5d367e32f4899035b41278a212cb35ef81902fc..3dcc30e5045dab206bc04def0cbfe78e7fc5dc2f 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+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>
 
        * libjava.compile/pr8712.java: New file, for PR java/8712.

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index a807c4c8d60d0ac4d6e78f7e5f3163ce925a66e8..9c8e664e67bd435167ff13ff84270752407f61b4 100644 (file)
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.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
 
 load_lib "libgloss.exp"
 
@@ -74,7 +74,7 @@ proc find_gcjh {} {
 }
 
 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
     # 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
@@ -87,7 +87,7 @@ proc find_javac {} {
        if {[info exists env(SUN_JAVAC)]} {
            set SUN_JAVAC $env(SUN_JAVAC)
        } else {
-           set SUN_JAVAC "$GCJ_UNDER_TEST -C"
+           set SUN_JAVAC "$GCJ_UNDER_TEST -C -I$libgcj_jar"
        }
     }
     return $SUN_JAVAC

diff --git a/libjava/testsuite/libjava.mauve/mauve.exp b/libjava/testsuite/libjava.mauve/mauve.exp
index 1ca2884249c450b63dcce94e682fae5495cacebe..ce4b0cee9cb6d4f86778845bb93d416a9b05f37e 100644 (file)
--- 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"