* tests/winFCmd.test (winFCmd-16.10,11): Merged new tests from

        core-8-4-branch.

2 files changed, 19 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index b5cc467..5c1fc93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-21  Don Porter	<dgp@users.sourceforge.net>
+
+	* tests/winFCmd.test (winFCmd-16.10,11): Merged new tests from
+	core-8-4-branch.
+
 2003-11-20  Miguel Sofer <msofer@users.sf.net>
 
 	* generic/tclVar.c: fix flag bit collision between
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index 49b4612..87c260d 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.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: winFCmd.test,v 1.23 2003/11/14 20:44:47 dgp Exp $
+# RCS: @(#) $Id: winFCmd.test,v 1.24 2003/11/21 18:47:59 dgp Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -1016,12 +1016,21 @@ test winFCmd-16.8 {Windows file normalization} {pcOnly} {
 test winFCmd-16.9 {Windows file normalization} {pcOnly} {
     file norm /bar/foo
 } "${d}:/bar/foo"
-test winFCmd-16.10 {Windows file normalization} {pcOnly knownBug} {
-    if {$d eq "C"} { set dd "D" } else { set dd "C" }
+if {$d eq "C"} { set dd "D" } else { set dd "C" }
+test winFCmd-16.10 {Windows file normalization} {pcOnly} {
     file norm ${dd}:foo
-} {Tcl doesn't know about a drive-specific cwd}
+} "${dd}:/foo"
+test winFCmd-16.11 {Windows file normalization} {pcOnly cdrom} {
+    cd ${d}:
+    cd $cdrom
+    cd ${d}:
+    cd $cdrom
+    # Must not crash
+    set result "no crash"
+} {no crash}
 
-unset d pwd
+cd $pwd
+unset d dd pwd
 
 # This block of code used to occur after the "return" call, so I'm
 # commenting it out and assuming that this code is still under construction.