Posted to tcl by patthoyts at Tue Nov 24 00:27:02 GMT 2009view pretty

Index: tests/fCmd.test
===================================================================
RCS file: /cvsroot/tcl/tcl/tests/fCmd.test,v
retrieving revision 1.70
diff -u -p -r1.70 fCmd.test
--- tests/fCmd.test	24 Nov 2009 00:08:27 -0000	1.70
+++ tests/fCmd.test	24 Nov 2009 00:24:30 -0000
@@ -49,6 +49,7 @@ if {[testConstraint unix]} {
 	set group [lindex $groupList 0]
 	testConstraint foundGroup 1
     }
+    testConstraint unixOrWin5 1
 }
 
 # Also used in winFCmd...
@@ -59,6 +60,7 @@ if {[testConstraint winOnly]} {
             testConstraint winVista 1
         } elseif {$major == 5} {
             testConstraint win2000orXP 1
+            testConstraint unixOrWin5 1
         }
     } else {
         testConstraint winOlderThan2000 1
@@ -275,7 +277,7 @@ test fCmd-3.14 {FileCopyRename: FileBase
 } -result {user "_totally_bogus_user" doesn't exist}
 test fCmd-3.15 {FileCopyRename: source[0] == '\0'} -setup {
     cleanup
-} -constraints {notRoot unixOrPc} -returnCodes error -body {
+} -constraints {notRoot unixOrWin} -returnCodes error -body {
     file mkdir td1
     file rename / td1
 } -result {error renaming "/" to "td1": file already exists}
@@ -415,7 +417,7 @@ test fCmd-5.4 {TclFileDeleteCmd: multipl
 } -cleanup {cleanup} -result {1 1 1 0 0 0}
 test fCmd-5.5 {TclFileDeleteCmd: stop at first error} -setup {
     cleanup
-} -constraints {notRoot unixOrPc} -body {
+} -constraints {notRoot unixOrWin} -body {
     createfile tf1
     createfile tf2
     file mkdir td1
@@ -793,7 +795,7 @@ test fCmd-9.3 {file rename: comprehensiv
 } -result {{tf3 tf4} 1 0}
 test fCmd-9.4 {file rename: comprehensive: dir to new name} -setup {
     cleanup
-} -constraints {unixOrPc notRoot testchmod notDarwin9 win2000orXP} -body {
+} -constraints {unixOrWin5 notRoot testchmod notDarwin9} -body {
     file mkdir td1 td2
     testchmod 555 td2
     file rename td1 td3
@@ -814,7 +816,7 @@ test fCmd-9.5 {file rename: comprehensiv
 } -result {tf1 tf2 1 0}
 test fCmd-9.6 {file rename: comprehensive: dir to self} -setup {
     cleanup
-} -constraints {notRoot unixOrPc testchmod win2000orXP} -body {
+} -constraints {notRoot unixOrWin5 testchmod} -body {
     file mkdir td1
     file mkdir td2
     testchmod 555 td2
@@ -1022,7 +1024,7 @@ test fCmd-10.2 {file copy: comprehensive
 } -result {{tf1 tf2 tf3 tf4} tf1 tf2 1 0}
 test fCmd-10.3 {file copy: comprehensive: dir to new name} -setup {
     cleanup
-} -constraints {notRoot unixOrPc 95or98 testchmod} -body {
+} -constraints {notRoot unixOrWin 95or98 testchmod} -body {
     file mkdir [file join td1 tdx]
     file mkdir [file join td2 tdy]
     testchmod 555 td2
@@ -1099,7 +1101,7 @@ test fCmd-10.5 {file copy: comprehensive
 } -result [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4 tds1 tds2 tds3 tds4} {1 {error copying "td1" to "[file join td2 td1]": file already exists}} {1 {error copying "tds1" to "[file join tdd1 tds1]": file already exists}} 1 1 1}]
 test fCmd-10.6 {file copy: comprehensive: dir to non-empty dir} -setup {
     cleanup
-} -constraints {notRoot unixOrPc testchmod} -body {
+} -constraints {notRoot unixOrWin testchmod} -body {
     file mkdir tds1
     file mkdir tds2
     file mkdir [file join tdd1 tds1 xxx]
@@ -1123,7 +1125,7 @@ test fCmd-10.7 {file rename: comprehensi
 } -result [subst {{tf1 tf2} {[file join td1 tf3] [file join td1 tf4]} 1 0}]
 test fCmd-10.8 {file rename: comprehensive: dir to new name and dir} -setup {
     cleanup
-} -constraints {notRoot unixOrPc 95or98 testchmod} -body {
+} -constraints {notRoot unixOrWin 95or98 testchmod} -body {
     file mkdir td1
     file mkdir td2
     file mkdir td3