Attachment "winFCmd_test.diff" to
ticket [767679ffff]
added by
hgiese
2003-07-08 18:12:34.
--- ./tcl.org/tests/winfcmd.test Fri Oct 04 08:25:14 2002
+++ ./tcl/tests/winfcmd.test Mon Jul 07 18:26:16 2003
@@ -81,6 +81,16 @@
}
}
+puts ""
+puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+if { $cdrom != "" } {
+ puts "\t\tFound CD-ROM drive $cdrom"
+} else {
+ puts "\t\tFound no CD-ROM drive"
+}
+puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+puts ""
+
proc findfile {dir} {
foreach p [glob $dir/*] {
if {[file type $p] == "file"} {
@@ -206,10 +216,17 @@
cleanup
list [catch {testfile mv nul tf1} msg] $msg
} {1 EINVAL}
-test winFCmd-1.13.1 {TclpRenameFile: errno: EACCES} {pcOnly winOlderThan2000} {
+
+# 1.13.1 split into two tests (also see 1.19.1 below)
+test winFCmd-1.13.1a {TclpRenameFile: errno: EACCES} {pcOnly nt winOlderThan2000} {
cleanup
list [catch {testfile mv nul tf1} msg] $msg
} {1 EACCES}
+test winFCmd-1.13.1b {TclpRenameFile: errno: ENOENT} {pcOnly 95} {
+ cleanup
+ list [catch {testfile mv nul tf1} msg] $msg
+} {1 ENOENT}
+
test winFCmd-1.14 {TclpRenameFile: errno: EACCES} {pcOnly 95} {
cleanup
createfile tf1
@@ -238,10 +255,17 @@
cleanup
list [catch {testfile mv nul tf1} msg] $msg
} {1 EINVAL}
-test winFCmd-1.19.1 {TclpRenameFile: errno == EACCES} {pcOnly winOlderThan2000} {
+
+# 1.19.1 split into two tests (also see 1.13.1 above)
+test winFCmd-1.19.1a {TclpRenameFile: errno == EACCES} {pcOnly nt winOlderThan2000} {
cleanup
list [catch {testfile mv nul tf1} msg] $msg
} {1 EACCES}
+test winFCmd-1.19.1b {TclpRenameFile: errno == ENOENT} {pcOnly 95} {
+ cleanup
+ list [catch {testfile mv nul tf1} msg] $msg
+} {1 ENOENT}
+
test winFCmd-1.20 {TclpRenameFile: src is dir} {pcOnly nt} {
# under 95, this would actually succeed and move the current dir out from
# under the current process!
@@ -600,10 +624,14 @@
cleanup
list [catch {testfile rmdir /} msg] $msg
} {1 {/ EACCES}}
+
test winFCmd-6.12 {TclpRemoveDirectory: errno == EACCES} {pcOnly 95} {
cleanup
createfile tf1
- list [catch {testfile rmdir tf1} msg] $msg
+ set res [catch {testfile rmdir tf1} msg]
+ # get rid of path
+ set msg [list [file tail [lindex $msg 0]] [lindex $msg 1]]
+ list $res $msg
} {1 {tf1 ENOTDIR}}
test winFCmd-6.13 {TclpRemoveDirectory: write-protected} {pcOnly} {
cleanup
@@ -612,11 +640,16 @@
testfile rmdir td1
file exists td1
} {0}
+
test winFCmd-6.14 {TclpRemoveDirectory: check if empty dir} {pcOnly 95} {
cleanup
file mkdir td1/td2
- list [catch {testfile rmdir td1} msg] $msg
+ set res [catch {testfile rmdir td1} msg]
+ # get rid of path
+ set msg [list [file tail [lindex $msg 0]] [lindex $msg 1]]
+ list $res $msg
} {1 {td1 EEXIST}}
+
test winFCmd-6.15 {TclpRemoveDirectory: !recursive} {pcOnly} {
cleanup
file mkdir td1/td2
@@ -681,7 +714,7 @@
test winFCmd-7.8 {TraverseWinTree: append \ to source if necessary} {pcOnly 95 cdrom} {
# cdrom can return either d:\ or D:/, but we only care about the errcode
list [catch {testfile rmdir $cdrom/} msg] [lindex $msg 1]
-} {1 EEXIST}
+} {1 EACCES} ;# was {1 EEXIST}
test winFCmd-7.9 {TraverseWinTree: append \ to source if necessary} {pcOnly nt cdrom} {
list [catch {testfile rmdir $cdrom/} msg] [lindex $msg 1]
} {1 EACCES}