This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
test harness fix for using jv-scan
- To: java-patches at gcc dot gnu dot org
- Subject: test harness fix for using jv-scan
- From: Anthony Green <green at redhat dot com>
- Date: Sat, 2 Jun 2001 02:09:38 -0700
- Reply-to: green at cygnus dot com
jv-scan is currently run via libjava_tcompile which uses some target
compilation procedures in dejagnu. These are really intended for
generating object files from source. For instance, they may tack on
target specific compiler options before invoking the `compiler' (or
jv-scan, in this case, causing it to fail).
With this change, we end up using local_exec instead.
Ok for trunk?
AG
2001-06-02 Anthony Green <green@redhat.com>
* lib/libjava.exp: Use local_exec to run jv-scan.
Index: testsuite/lib/libjava.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.26
diff -u -p -r1.26 libjava.exp
--- libjava.exp 2001/05/04 19:33:10 1.26
+++ libjava.exp 2001/06/02 09:01:33
@@ -540,18 +540,13 @@ proc test_libjava_from_javac { options s
# 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]