Remove libgcjdata hack. Fix jv-scan usage in dejagnu.
From-SVN: r42812
This commit is contained in:
committed by
Anthony Green
parent
ef88b07dff
commit
9f0fbbabfb
@@ -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]
|
||||
|
||||
Reference in New Issue
Block a user