diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jacks/jacks.exp | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c08f4c5..7e27a66 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 32529e3..4640a71 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} { |