OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libjava.exp (libjava_init): Use UTF-8 encoding. 

* lib/libjava.exp (libjava_init): Use UTF-8 encoding.
	(test_libjava_from_javac): Likewise.

From-SVN: r41617
This commit is contained in:
Tom Tromey 2001-04-27 00:56:16 +00:00 committed by Tom Tromey
parent 041c9d5a47
commit f24fd724c2
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2001-04-25 Tom Tromey <tromey@redhat.com>
* lib/libjava.exp (libjava_init): Use UTF-8 encoding.
(test_libjava_from_javac): Likewise.
2001-04-09 Tom Tromey <tromey@redhat.com>
* libjava.lang/pr83.xfail: Removed.

10
libjava/testsuite/lib/libjava.exp
View File

@ -127,6 +127,9 @@ proc libjava_init { args } {
}
}
# Always set encoding used by gcj.
append GCJ_UNDER_TEST " --encoding=UTF-8"
if [info exists env(LD_LIBRARY_PATH)] {
set original_ld_library_path $env(LD_LIBRARY_PATH)
} else {
@ -501,15 +504,18 @@ 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 \
"compiler=$jvscan additional_flags=--print-main"]]]
"$jvscan additional_flags=--print-main"]]]
verbose "main name is $main_name"
set class_out [string trim \
[prune_warnings \
[libjava_tcompile $srcfile "" none \
"compiler=$jvscan additional_flags=--list-class"]]]
"$jvscan additional_flags=--list-class"]]]
verbose "class list is $class_out"
if {[string match "*parse error*" $main_name]