diff options
| author | uweigand <uweigand@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-21 18:14:47 +0000 |
|---|---|---|
| committer | uweigand <uweigand@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-21 18:14:47 +0000 |
| commit | 29bf5117eea7e6b082e9d10260941c1e99cf72c7 (patch) | |
| tree | 3c56cd4f0caed0b26dd7f0d585ed8db5272f3684 | |
| parent | 1c7897c9ef38ed285ea4cc34304a121186623027 (diff) | |
| download | ppe42-gcc-29bf5117eea7e6b082e9d10260941c1e99cf72c7.tar.gz ppe42-gcc-29bf5117eea7e6b082e9d10260941c1e99cf72c7.zip | |
* libjava.loader/loader.exp (gcj_loader_test_one): Fix typo in
'type' argument to libjava_tcompile.
(gcj_loader_run): Use libjava_tcompile instead of running
GCJ_UNDER_TEST directly.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59351 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.loader/loader.exp | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 7cdad4a06a5..a4d86646850 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2002-11-21 Ulrich Weigand <uweigand@de.ibm.com> + + * libjava.loader/loader.exp (gcj_loader_test_one): Fix typo in + 'type' argument to libjava_tcompile. + (gcj_loader_run): Use libjava_tcompile instead of running + GCJ_UNDER_TEST directly. + 2002-11-05 Tom Tromey <tromey@redhat.com> * libjava.jacks/jacks.exp: New file. diff --git a/libjava/testsuite/libjava.loader/loader.exp b/libjava/testsuite/libjava.loader/loader.exp index 6da70165102..6864a5f663a 100644 --- a/libjava/testsuite/libjava.loader/loader.exp +++ b/libjava/testsuite/libjava.loader/loader.exp @@ -13,7 +13,7 @@ proc gcj_loader_test_one {srcfile} { set args [libjava_arguments link] lappend args "additional_flags=--main=[file rootname [file tail $srcfile]] $srcdir/$subdir/MyLoader.java $objdir/dummy.o" set x [prune_warnings \ - [libjava_tcompile $srcfile "$executable" "$executable" $args]] + [libjava_tcompile $srcfile "$executable" executable $args]] if { $x != "" } { verbose "target_compile failed: $x" 2 @@ -44,8 +44,11 @@ proc gcj_loader_run {} { } pass "bytecompile $file" + set args [libjava_arguments compile] + lappend args "additional_flags=--resource $objdir/dummy.class" set x [prune_warnings \ - [eval exec "$GCJ_UNDER_TEST --resource $objdir/dummy.class -c $objdir/dummy.class -o $objdir/dummy.o"]] + [libjava_tcompile "$objdir/dummy.class" "$objdir/dummy.o" object $args]] + if { $x != "" } { verbose "resource compilation failed: $x" 2 |
