aboutsummaryrefslogtreecommitdiff
path: root/libjava/testsuite
diff options
context:
space:
mode:
authorUlrich Weigand <uweigand@de.ibm.com>2002-11-21 18:14:47 +0000
committerUlrich Weigand <uweigand@gcc.gnu.org>2002-11-21 18:14:47 +0000
commit5f2925a72d2c2162a6a08ee712937bdf79581777 (patch)
tree3c56cd4f0caed0b26dd7f0d585ed8db5272f3684 /libjava/testsuite
parentd1bf262d83bcc7e834d0319131250005d5af386e (diff)
downloadgcc-5f2925a72d2c2162a6a08ee712937bdf79581777.zip
gcc-5f2925a72d2c2162a6a08ee712937bdf79581777.tar.gz
gcc-5f2925a72d2c2162a6a08ee712937bdf79581777.tar.bz2
loader.exp (gcj_loader_test_one): Fix typo in 'type' argument to libjava_tcompile.
* 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. From-SVN: r59351
Diffstat (limited to 'libjava/testsuite')
-rw-r--r--libjava/testsuite/ChangeLog7
-rw-r--r--libjava/testsuite/libjava.loader/loader.exp7
2 files changed, 12 insertions, 2 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 7cdad4a0..a4d866468 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 6da7016..6864a5f 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