From: Tom Tromey <tromey@gcc.gnu.org>
Date: Tue, 12 Sep 2006 16:28:43 +0000 (+0000)
Subject: * testsuite/libjava.jacks/jacks.exp (load_gcc_lib): Removed.
X-Git-Tag: releases/gcc-4.2.0~1428
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbe5c0840a308a1d51d989349d90346fd8c59c99;p=thirdparty%2Fgcc.git

* testsuite/libjava.jacks/jacks.exp (load_gcc_lib): Removed.

From-SVN: r116892
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c08f4c524cfc..7e27a661b403 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-12  Tom Tromey  <tromey@redhat.com>
+
+	* testsuite/libjava.jacks/jacks.exp (load_gcc_lib): Removed.
+
 2006-09-07  Matthias Klose  <doko@debian.org>
 
 	* Makefile.am (AM_CXXFLAGS): Remove duplicate define.
@@ -68,6 +72,7 @@
 	* jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter.
 	Pass millis to _Jv_CondWait.
 
+>>>>>>> .r116849
 2006-08-31  Tom Tromey  <tromey@redhat.com>
 
 	PR libgcj/28698:
diff --git a/libjava/testsuite/libjava.jacks/jacks.exp b/libjava/testsuite/libjava.jacks/jacks.exp
index 32529e3b08e7..4640a71e9ca7 100644
--- a/libjava/testsuite/libjava.jacks/jacks.exp
+++ b/libjava/testsuite/libjava.jacks/jacks.exp
@@ -1,11 +1,6 @@
 # Run the Jacks test suite.
 # See http://www-124.ibm.com/developerworks/oss/cvs/jikes/~checkout~/jacks/jacks.html
 
-proc load_gcc_lib { filename } {
-    global srcdir
-    load_file $srcdir/../../gcc/testsuite/lib/$filename
-}
-
 load_gcc_lib target-libpath.exp
 
 proc gcj_jacks_setup_xfail {ary} {