From af77fa17787bb4cd9235c1d1ddadf602ee86fd73 Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 6 Sep 2001 21:05:56 +0000 Subject: * Updated test to support newer HP-UX releases that properly report euc-jp as the system encoding for Japanese. Bug report and patch verification by Bob Techentin. [Bug 453883] --- ChangeLog | 7 +++++++ tests/unixInit.test | 13 ++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f47ddc7..b507153 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-09-06 Don Porter + + * tests/unixInit.test (unixInit-3.2): Updated test to support + newer HP-UX releases that properly report euc-jp as the system + encoding for Japanese. Bug report and patch verification by + Bob Techentin. [Bug 453883] + 2001-09-06 Vince Darley * generic/tclTest.c: tests of old-fs hooks no longer cause problems diff --git a/tests/unixInit.test b/tests/unixInit.test index d94ea98..7d85d02 100644 --- a/tests/unixInit.test +++ b/tests/unixInit.test @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: unixInit.test,v 1.23 2001/08/27 02:14:08 dgp Exp $ +# RCS: @(#) $Id: unixInit.test,v 1.24 2001/09/06 21:05:56 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -292,11 +292,14 @@ test unixInit-3.2 {TclpSetInitialEncodings} {unixOnly installedTcl} { unset env(LC_ALL) catch {set env(LC_ALL) $oldlc_all} - switch $tcl_platform(os) { - HP-UX {set expectedEncoding shiftjis} - default {set expectedEncoding euc-jp} + set validEncodings [list euc-jp] + if {[string match HP-UX $tcl_platform(os)]} { + # Some older HP-UX systems need us to accept this as valid + # Bug 453883 reports that newer HP-UX systems report euc-jp + # like everybody else. + lappend validEncodings shiftjis } - string compare $enc $expectedEncoding + expr {[lsearch -exact $validEncodings $enc] < 0} } 0 test unixInit-4.1 {TclpSetVariables} {unixOnly} { -- cgit v0.12