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

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 7cdad4a06a5a0275ec6728a1381b95aa96fcbcb1..a4d86646850c414738d593750423a78787129845 100644 (file)
--- 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 6da70165102682276ba83ba97bea5e5e886132c5..6864a5f663ab99ef3f6088a4ad4b42be35fde17e 100644 (file)
--- 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