From 49cb764a5a3c9a06ea2bebcbe8d7f46cca7472f5 Mon Sep 17 00:00:00 2001 From: dgp Date: Sun, 20 Nov 2022 22:08:19 +0000 Subject: In most testing scenarios, the TCL_LIBRARY variable is masking a bug in system encoding discovery. Adapted test unixInit-3.2 to stop shielding this problem from view. --- tests/unixInit.test | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/unixInit.test b/tests/unixInit.test index 2ea7d8e..69c3eac 100644 --- a/tests/unixInit.test +++ b/tests/unixInit.test @@ -346,6 +346,8 @@ test unixInit-3.1 {TclpSetInitialEncodings} -constraints { } -match regexp -result {^(iso8859-15?|utf-8)$} test unixInit-3.2 {TclpSetInitialEncodings} -setup { catch {set oldlc_all $env(LC_ALL)} + catch {set oldtcl_library $env(TCL_LIBRARY)} + unset -nocomplain env(TCL_LIBRARY) } -constraints {unix stdio} -body { set env(LANG) japanese set env(LC_ALL) japanese @@ -364,6 +366,7 @@ test unixInit-3.2 {TclpSetInitialEncodings} -setup { } -cleanup { unset -nocomplain env(LANG) env(LC_ALL) catch {set env(LC_ALL) $oldlc_all} + catch {set env(TCL_LIBRARY) $oldtcl_library} } -result 0 test unixInit-4.1 {TclpSetVariables} {unix} { -- cgit v0.12