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

  1. Index: tests/fCmd.test
  2. ===================================================================
  3. RCS file: /cvsroot/tcl/tcl/tests/fCmd.test,v
  4. retrieving revision 1.70
  5. diff -u -p -r1.70 fCmd.test
  6. --- tests/fCmd.test 24 Nov 2009 00:08:27 -0000 1.70
  7. +++ tests/fCmd.test 24 Nov 2009 00:24:30 -0000
  8. @@ -49,6 +49,7 @@ if {[testConstraint unix]} {
  9. set group [lindex $groupList 0]
  10. testConstraint foundGroup 1
  11. }
  12. + testConstraint unixOrWin5 1
  13. }
  14.  
  15. # Also used in winFCmd...
  16. @@ -59,6 +60,7 @@ if {[testConstraint winOnly]} {
  17. testConstraint winVista 1
  18. } elseif {$major == 5} {
  19. testConstraint win2000orXP 1
  20. + testConstraint unixOrWin5 1
  21. }
  22. } else {
  23. testConstraint winOlderThan2000 1
  24. @@ -275,7 +277,7 @@ test fCmd-3.14 {FileCopyRename: FileBase
  25. } -result {user "_totally_bogus_user" doesn't exist}
  26. test fCmd-3.15 {FileCopyRename: source[0] == '\0'} -setup {
  27. cleanup
  28. -} -constraints {notRoot unixOrPc} -returnCodes error -body {
  29. +} -constraints {notRoot unixOrWin} -returnCodes error -body {
  30. file mkdir td1
  31. file rename / td1
  32. } -result {error renaming "/" to "td1": file already exists}
  33. @@ -415,7 +417,7 @@ test fCmd-5.4 {TclFileDeleteCmd: multipl
  34. } -cleanup {cleanup} -result {1 1 1 0 0 0}
  35. test fCmd-5.5 {TclFileDeleteCmd: stop at first error} -setup {
  36. cleanup
  37. -} -constraints {notRoot unixOrPc} -body {
  38. +} -constraints {notRoot unixOrWin} -body {
  39. createfile tf1
  40. createfile tf2
  41. file mkdir td1
  42. @@ -793,7 +795,7 @@ test fCmd-9.3 {file rename: comprehensiv
  43. } -result {{tf3 tf4} 1 0}
  44. test fCmd-9.4 {file rename: comprehensive: dir to new name} -setup {
  45. cleanup
  46. -} -constraints {unixOrPc notRoot testchmod notDarwin9 win2000orXP} -body {
  47. +} -constraints {unixOrWin5 notRoot testchmod notDarwin9} -body {
  48. file mkdir td1 td2
  49. testchmod 555 td2
  50. file rename td1 td3
  51. @@ -814,7 +816,7 @@ test fCmd-9.5 {file rename: comprehensiv
  52. } -result {tf1 tf2 1 0}
  53. test fCmd-9.6 {file rename: comprehensive: dir to self} -setup {
  54. cleanup
  55. -} -constraints {notRoot unixOrPc testchmod win2000orXP} -body {
  56. +} -constraints {notRoot unixOrWin5 testchmod} -body {
  57. file mkdir td1
  58. file mkdir td2
  59. testchmod 555 td2
  60. @@ -1022,7 +1024,7 @@ test fCmd-10.2 {file copy: comprehensive
  61. } -result {{tf1 tf2 tf3 tf4} tf1 tf2 1 0}
  62. test fCmd-10.3 {file copy: comprehensive: dir to new name} -setup {
  63. cleanup
  64. -} -constraints {notRoot unixOrPc 95or98 testchmod} -body {
  65. +} -constraints {notRoot unixOrWin 95or98 testchmod} -body {
  66. file mkdir [file join td1 tdx]
  67. file mkdir [file join td2 tdy]
  68. testchmod 555 td2
  69. @@ -1099,7 +1101,7 @@ test fCmd-10.5 {file copy: comprehensive
  70. } -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}]
  71. test fCmd-10.6 {file copy: comprehensive: dir to non-empty dir} -setup {
  72. cleanup
  73. -} -constraints {notRoot unixOrPc testchmod} -body {
  74. +} -constraints {notRoot unixOrWin testchmod} -body {
  75. file mkdir tds1
  76. file mkdir tds2
  77. file mkdir [file join tdd1 tds1 xxx]
  78. @@ -1123,7 +1125,7 @@ test fCmd-10.7 {file rename: comprehensi
  79. } -result [subst {{tf1 tf2} {[file join td1 tf3] [file join td1 tf4]} 1 0}]
  80. test fCmd-10.8 {file rename: comprehensive: dir to new name and dir} -setup {
  81. cleanup
  82. -} -constraints {notRoot unixOrPc 95or98 testchmod} -body {
  83. +} -constraints {notRoot unixOrWin 95or98 testchmod} -body {
  84. file mkdir td1
  85. file mkdir td2
  86. file mkdir td3