--- src_tcl_orig\tests\winFCmd.test	Wed Sep 29 02:40:05 2004
+++ src_tcl\tests\winFCmd.test	Wed Sep 29 02:30:44 2004
@@ -1023,15 +1023,15 @@
     # Must not crash
     set result "no crash"
 } -cleanup {
-    cd ${d}:
+    cd $pwd
 } -result {no crash}
 test winFCmd-16.12 {Windows file normalization} -constraints win -setup {
-    set oldwd [pwd]
     set oldhome ""
     catch {set oldhome $::env(HOME)}
 } -body {
-    set expectedResult [file normalize ${d}:]
-    set ::env(HOME) ${d}:
+# Test 'cd' normalization when HOME is absolute
+    set expectedResult [file normalize ${d}:/]
+    set ::env(HOME) ${d}:/
     cd
     set result [pwd]; # <- Must not crash
     if { [string equal $result $expectedResult] } {
@@ -1041,10 +1041,27 @@
     }
 } -cleanup {
     set ::env(HOME) $oldhome
-    cd $oldwd
+    cd $pwd
+} -result ok
+test winFCmd-16.13 {Windows file normalization} -constraints win -setup {
+    set oldhome ""
+    catch {set oldhome $::env(HOME)}
+} -body {
+# Test 'cd' normalization when HOME is relative
+    set ::env(HOME) ${d}:
+    cd
+    set result [pwd]; # <- Must not crash
+    if { [string equal $result $pwd] } {
+	concat ok
+    } else {
+	list $result != $pwd
+    }
+} -cleanup {
+    set ::env(HOME) $oldhome
+    cd $pwd
 } -result ok
 
-test winFCmd-16.13 {Windows bad permissions cd} -constraints win -setup {
+test winFCmd-17.1 {Windows bad permissions cd} -constraints win -setup {
     set oldwd [pwd]
 } -body {
     set d {}
