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

From-SVN: r116892

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c08f4c524cfc9f9c28725e2d84153dd1493ab78f..7e27a661b40399434e13dfb3447d22fd6270c44a 100644 (file)
--- 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 32529e3b08e735a15065e2cae88caadc65a9009d..4640a71e9ca79b43b131244a46ee965d04a8cc1d 100644 (file)
--- 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} {