diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2023-03-07 12:53:58 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2023-03-07 12:53:58 (GMT) |
| commit | 8c5476848accca82b9dedf7f919ad0a44d726030 (patch) | |
| tree | a9c2f1a2c897b2180faf9c9d8ef369684c8243e0 /tests/fCmd.test | |
| parent | 1ae5fd81988e8b441287635556dd750f21bc0560 (diff) | |
| parent | 4df874dd7fcd7292ca7110d27e0d26ad8b551360 (diff) | |
| download | tcl-8c5476848accca82b9dedf7f919ad0a44d726030.zip tcl-8c5476848accca82b9dedf7f919ad0a44d726030.tar.gz tcl-8c5476848accca82b9dedf7f919ad0a44d726030.tar.bz2 | |
Merge 8.7 - testchmod fixes
Diffstat (limited to 'tests/fCmd.test')
| -rw-r--r-- | tests/fCmd.test | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tests/fCmd.test b/tests/fCmd.test index 0752be6..d60e58c 100644 --- a/tests/fCmd.test +++ b/tests/fCmd.test @@ -1161,6 +1161,7 @@ test fCmd-10.3.1 {file copy: comprehensive: dir to new name} -setup { file mkdir [file join td1 tdx] file mkdir [file join td2 tdy] testchmod 0o555 td2 + testchmod 0o555 td2/tdy; # Above line removes inherited perms. So restore. file copy td1 td3 file copy td2 td4 list [lsort [glob td*]] [glob -directory td3 t*] \ @@ -1182,10 +1183,19 @@ test fCmd-10.4 {file copy: comprehensive: file to existing file} -setup { createfile tfd2 createfile tfd3 createfile tfd4 - testchmod 0o444 tfs3 - testchmod 0o444 tfs4 - testchmod 0o444 tfd2 - testchmod 0o444 tfd4 + if {$::tcl_platform(platform) eq "windows"} { + # On Windows testchmode will attach an ACL which file copy cannot handle + # so use good old attributes which file copy does understand + file attribute tfs3 -readonly 1 + file attribute tfs4 -readonly 1 + file attribute tfd2 -readonly 1 + file attribute tfd4 -readonly 1 + } else { + testchmod 0o444 tfs3 + testchmod 0o444 tfs4 + testchmod 0o444 tfd2 + testchmod 0o444 tfd4 + } set msg [list [catch {file copy tf1 tf2} msg] $msg] file copy -force tfs1 tfd1 file copy -force tfs2 tfd2 |