merge 8.5 (note: to avoid too many conflicts, merged using `fossil merge --baseline 0055a16a8b core-8-5-branch`)

1 files changed, 12 insertions, 5 deletions

diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 4ca90c6..516505c 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -20,7 +20,7 @@ testConstraint testsetplatform [llength [info commands testsetplatform]]
 testConstraint testvolumetype  [llength [info commands testvolumetype]]
 testConstraint linkDirectory [expr {
     ![testConstraint win] ||
-    ([string index $tcl_platform(osVersion) 0] >= 5
+    ($::tcl_platform(osVersion) >= 5.0
      && [lindex [file system [temporaryDirectory]] 1] eq "NTFS")
 }]
 
@@ -145,7 +145,7 @@ test cmdAH-4.5 {Tcl_EncodingObjCmd} {
 } 8C
 test cmdAH-4.6 {Tcl_EncodingObjCmd} {
     set system [encoding system]
-    encoding system identity
+    encoding system iso8859-1
     set x [encoding convertto jis0208 \u4e4e]
     encoding system $system
     set x
@@ -165,7 +165,7 @@ test cmdAH-4.9 {Tcl_EncodingObjCmd} {
 } \u4e4e
 test cmdAH-4.10 {Tcl_EncodingObjCmd} {
     set system [encoding system]
-    encoding system identity
+    encoding system iso8859-1
     set x [encoding convertfrom jis0208 8C]
     encoding system $system
     set x
@@ -178,11 +178,11 @@ test cmdAH-4.12 {Tcl_EncodingObjCmd} {
 } {1 {wrong # args: should be "encoding system ?encoding?"}}
 test cmdAH-4.13 {Tcl_EncodingObjCmd} {
     set system [encoding system]
-    encoding system identity
+    encoding system iso8859-1
     set x [encoding system]
     encoding system $system
     set x
-} identity
+} iso8859-1
 
 test cmdAH-5.1 {Tcl_FileObjCmd} {
     list [catch file msg] $msg
@@ -541,6 +541,13 @@ test cmdAH-9.51 {Tcl_FileObjCmd: tail} testsetplatform {
     testsetplatform windows
     file tail {foo\bar}
 } bar
+test cmdAH-9.52 {Tcl_FileObjCmd: tail / normalize, bug 7a9dc52b29} {
+    list \
+	[file tail {~/~foo}] \
+	[file tail {~/test/~foo}] \
+	[file tail [file normalize {~/~foo}]] \
+	[file tail [file normalize {~/test/~foo}]]
+} [lrepeat 4 ./~foo]
 
 # rootname