merge 8.5: fixes segfault [7a9dc52b29] and wrong normalization (inside TclJoinPath) for pure relative path-segments; test-cases extended and several windows-related are fixed.

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/winFile.test b/tests/winFile.test
index 2c47f5f..eb6addd 100644
--- a/tests/winFile.test
+++ b/tests/winFile.test
@@ -43,13 +43,14 @@ test winFile-1.4 {TclpGetUserHome} {win nt nonPortable} {
 
 test winFile-2.1 {TclpMatchFiles: case sensitivity} -constraints {win} -body {
     makeFile {} GlobCapS
-    list [glob -nocomplain GlobC*] [glob -nocomplain globc*]
-} -cleanup {
+    set args [list -nocomplain -tails -directory [temporaryDirectory]]
+    list [glob {*}$args GlobC*] [glob {*}$args globc*]} -cleanup {
     removeFile GlobCapS
 } -result {GlobCapS GlobCapS}
 test winFile-2.2 {TclpMatchFiles: case sensitivity} -constraints {win} -body {
     makeFile {} globlower
-    list [glob -nocomplain globl*] [glob -nocomplain gLOBl*]
+    set args [list -nocomplain -tails -directory [temporaryDirectory]]
+    list [glob {*}$args globl*] [glob {*}$args gLOBl*]
 } -cleanup {
     removeFile globlower
 } -result {globlower globlower}