OSDN Git Service

* testsuite/libjava.jacks/jacks.exp (load_gcc_lib): Removed.
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 12 Sep 2006 16:28:43 +0000 (16:28 +0000)
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 12 Sep 2006 16:28:43 +0000 (16:28 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116892 138bc75d-0d04-0410-961f-82ee72b054a4

libjava/ChangeLog
libjava/testsuite/libjava.jacks/jacks.exp

index c08f4c5..7e27a66 100644 (file)
@@ -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:
index 32529e3..4640a71 100644 (file)
@@ -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} {