summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstanton <stanton>1999-04-06 20:21:25 (GMT)
committerstanton <stanton>1999-04-06 20:21:25 (GMT)
commitee56699f6f535c4b548fba2984baac97f25f385e (patch)
tree4f5ced2a86b24a8c8ae2a28107dc32825340c969
parentf59414bfb04efd9d9ee0334345423b7d4328c522 (diff)
downloadtcl-ee56699f6f535c4b548fba2984baac97f25f385e.zip
tcl-ee56699f6f535c4b548fba2984baac97f25f385e.tar.gz
tcl-ee56699f6f535c4b548fba2984baac97f25f385e.tar.bz2
* tests/unixInit.test:
* tests/fileName.test: Minor test nits. * unix/tclUnixInit.c (TclpSetInitialEncodings): Fixed bad initial encoding string.
-rw-r--r--ChangeLog8
-rw-r--r--tests/fileName.test3
-rw-r--r--tests/unixInit.test9
-rw-r--r--unix/tclUnixInit.c4
4 files changed, 14 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dac30f..1b0ae99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-04-06 <stanton@scriptics.com>
+
+ * tests/unixInit.test:
+ * tests/fileName.test: Minor test nits.
+
+ * unix/tclUnixInit.c (TclpSetInitialEncodings): Fixed bad initial
+ encoding string.
+
1999-04-06 <surles@scriptics.com>
* generic/tclVar.c:
diff --git a/tests/fileName.test b/tests/fileName.test
index 796e0ff..540c50a 100644
--- a/tests/fileName.test
+++ b/tests/fileName.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: fileName.test,v 1.1.2.7 1999/04/05 23:14:18 stanton Exp $
+# RCS: @(#) $Id: fileName.test,v 1.1.2.8 1999/04/06 20:21:25 stanton Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -1401,6 +1401,7 @@ test filename-16.13 {windows specific globbing} {pcOnly} {
# cleanup
file delete -force //[info hostname]/c/globTest
cd $temp
+file delete -force globTest
set env(HOME) $oldhome
testsetplatform $platform
catch {unset oldhome platform temp result}
diff --git a/tests/unixInit.test b/tests/unixInit.test
index 5a3620d..53db8f3 100644
--- a/tests/unixInit.test
+++ b/tests/unixInit.test
@@ -10,16 +10,12 @@
# 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.1.2.7 1999/03/25 04:32:19 hershey Exp $
+# RCS: @(#) $Id: unixInit.test,v 1.1.2.8 1999/04/06 20:21:26 stanton Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
source [file join [pwd] [file dirname [info script]] defs.tcl]
}
-if {[catch {csh -c "setenv LANG japanese"}] == 0} {
- set ::tcltest::testConfig(japanese) 1
-}
-
catch {set oldlibrary $env(TCL_LIBRARY); unset env(TCL_LIBRARY)}
catch {set oldlang $env(LANG)}
set env(LANG) C
@@ -153,8 +149,7 @@ test unixInit-3.1 {TclpSetInitialEncodings} {unixOnly installedTcl} {
set enc
} {iso8859-1}
-test unixInit-3.1 {TclpSetInitialEncodings} \
- {unixOnly japanese installedTcl nonPortable} {
+test unixInit-3.2 {TclpSetInitialEncodings} {unixOnly installedTcl} {
set env(LANG) japanese
set f [open "|[list $tcltest]" w+]
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index 99651f7..4542448 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixInit.c,v 1.1.2.13 1999/04/06 19:06:56 surles Exp $
+ * RCS: @(#) $Id: tclUnixInit.c,v 1.1.2.14 1999/04/06 20:21:27 stanton Exp $
*/
#include "tclInt.h"
@@ -335,7 +335,7 @@ TclpSetInitialEncodings()
langEnv = NULL;
}
- encoding = "iso-8859-1";
+ encoding = "iso8859-1";
if (langEnv != NULL) {
for (i = 0; localeTable[i].lang != NULL; i++) {
if (strcmp(localeTable[i].lang, langEnv) == 0) {