From fd429e2f4aa3b5ecdfeb4978be47661fe1a04205 Mon Sep 17 00:00:00 2001
From: green <green@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 2 Jun 2001 19:13:52 +0000
Subject: Remove libgcjdata hack.   Fix jv-scan usage in dejagnu.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42812 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/testsuite/lib/libjava.exp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'libjava/testsuite/lib/libjava.exp')

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 22ec065f1fb..4b797bfd04e 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -540,18 +540,13 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e
     # Find name to use for --main, and name of all class files.
     set jvscan [find_jvscan]
     verbose "jvscan is $jvscan"
-    # We insulate ourselves from the user's locale by forcing the
-    # encoding on jvscan.
-    set jvscan "compiler=$jvscan additional_flags=--encoding=UTF-8"
     set main_name [string trim \
 		     [prune_warnings \
-			[libjava_tcompile $srcfile "" none \
-			   "$jvscan additional_flags=--print-main"]]]
+			[lindex [local_exec "$jvscan --encoding=UTF-8 $srcfile --print-main" "" "" 300] 1]]]
     verbose "main name is $main_name"
     set class_out [string trim \
 		     [prune_warnings \
-			[libjava_tcompile $srcfile "" none \
-			   "$jvscan additional_flags=--list-class"]]]
+			[lindex [local_exec "$jvscan --encoding=UTF-8 $srcfile --list-class" "" "" 300] 1]]]
     verbose "class list is $class_out"
 
     if {[string match "*parse error*" $main_name]
-- 
cgit v1.2.3