From f24fd724c2bb211021ac6d7fe3d9375f8218c0ec Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 27 Apr 2001 00:56:16 +0000 Subject: [PATCH] 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 --- libjava/testsuite/ChangeLog | 5 +++++ libjava/testsuite/lib/libjava.exp | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 60d6eb37983..c8b9a5f94cb 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2001-04-25 Tom Tromey + + * lib/libjava.exp (libjava_init): Use UTF-8 encoding. + (test_libjava_from_javac): Likewise. + 2001-04-09 Tom Tromey * libjava.lang/pr83.xfail: Removed. diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 1fca9f400f6..18a07e25244 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -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] -- 2.30.2