diff options
Diffstat (limited to 'libjava/testsuite')
| -rw-r--r-- | libjava/testsuite/Makefile.in | 1 | ||||
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index c58158b5c29..bb778fb4489 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -88,7 +88,6 @@ GCTESTSPEC = @GCTESTSPEC@ HASH_SYNC_SPEC = @HASH_SYNC_SPEC@ INCLTDL = @INCLTDL@ JC1GCSPEC = @JC1GCSPEC@ -LIBDATASTARTSPEC = @LIBDATASTARTSPEC@ LIBFFI = @LIBFFI@ LIBFFIINCS = @LIBFFIINCS@ LIBGCJDEBUG = @LIBGCJDEBUG@ 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] |
