diff options
| author | kseitz <kseitz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-24 20:40:47 +0000 |
|---|---|---|
| committer | kseitz <kseitz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-24 20:40:47 +0000 |
| commit | a78b652c30ccccb155dc1d9d644e8f42a53d6d19 (patch) | |
| tree | 392327dccccc4770b0a2781a808516934695154c /libjava/testsuite/lib/libjava.exp | |
| parent | 3ec4bac06271df56944bc68716e9f21798301a99 (diff) | |
| download | ppe42-gcc-a78b652c30ccccb155dc1d9d644e8f42a53d6d19.tar.gz ppe42-gcc-a78b652c30ccccb155dc1d9d644e8f42a53d6d19.zip | |
* include/java-interp.h (_Jv_InterpFrame::get_pc): Only deduct
one when pc_ptr is non-NULL.
* prims.cc (parse_init_args): Enable JVMTI with agentlib
and agentpath options.
* testsuite/lib/libjava.exp (exec_gij): Add new addl_flags
parameter.
* testsuite/libjava.jvmti/jvmti-interp.exp (gij_jvmti_test_one):
Pass '-agentlib:dummyagent' when executing gij.
(gij_jvmti_run): Build dummy JVMTI agent before running tests,
and remove it when finished.
* testsuite/libjava.jvmti/dummyagent.c: New file.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125040 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/testsuite/lib/libjava.exp')
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 09d4f099a02..c684bf64d78 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007 Free Software Foundation proc load_gcc_lib { filename } { global srcdir @@ -494,7 +494,7 @@ proc gcj_invoke {program expectFile ld_library_additions} { } } -proc exec_gij {jarfile expectFile ld_library_additions} { +proc exec_gij {jarfile expectFile {ld_library_additions {}} {addl_flags {}}} { global env global libjava_ld_library_path global ld_library_path @@ -512,9 +512,9 @@ proc exec_gij {jarfile expectFile ld_library_additions} { set gij [libjava_find_gij] set classname [file rootname [file tail $jarfile]] - puts "LD_LIBRARY_PATH=. $gij -cp $jarfile $classname" + puts "LD_LIBRARY_PATH=. $gij -cp $jarfile $addl_flags $classname" - set result [libjava_load $gij "-cp $jarfile $classname"] + set result [libjava_load $gij "-cp $jarfile $addl_flags $classname"] set status [lindex $result 0] set output [lindex $result 1] |
