diff options
author | dgp <dgp@users.sourceforge.net> | 2019-09-11 16:06:19 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2019-09-11 16:06:19 (GMT) |
commit | ae9073b8539290411d2afa62d46a39079458dc23 (patch) | |
tree | 135ca022a71bff5f9698d3319769ec320bd0baf1 /tests | |
parent | 810e5a0f6911de9bf6c77c9ec3b467225de93bbd (diff) | |
parent | c2f8b74ee565c5ebeb9a4d320ddcd8922dbf020b (diff) | |
download | tcl-ae9073b8539290411d2afa62d46a39079458dc23.zip tcl-ae9073b8539290411d2afa62d46a39079458dc23.tar.gz tcl-ae9073b8539290411d2afa62d46a39079458dc23.tar.bz2 |
merge 8.7
Diffstat (limited to 'tests')
-rw-r--r-- | tests/cmdAH.test | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/tests/cmdAH.test b/tests/cmdAH.test index efab13e..39bd310 100644 --- a/tests/cmdAH.test +++ b/tests/cmdAH.test @@ -1309,8 +1309,28 @@ test cmdAH-24.20.2 {Tcl_FileObjCmd: mtime 64-bit time_t, bug [4718b41c56]} -setu test cmdAH-25.1 {Tcl_FileObjCmd: owned} -returnCodes error -body { file owned a b } -result {wrong # args: should be "file owned name"} -test cmdAH-25.2 {Tcl_FileObjCmd: owned} -constraints win -body { - file owned $gorpfile +test cmdAH-25.2 {Tcl_FileObjCmd: owned} -constraints win -setup { + set fn $gorpfile + # prefer temp file to check owner (try to avoid bug [7de2d722bd]): + if { + [info exists ::env(TEMP)] && [file isdirectory $::env(TEMP)] && + [file dirname $fn] ne [file normalize $::env(TEMP)] + } { + set fn [file join $::env(TEMP)/test-owner-from-tcl.txt] + set fn [makeFile "data" test-owner-from-tcl.txt $::env(TEMP)] + } + # be sure we have really owned this file before trying to check that + # (avoid dependency on admin with UAC and the setting "System objects: + # Default owner for objects created by members of the Administrators group"): + catch { + exec takeown /F [file nativename $fn] + } +} -body { + file owned $fn +} -cleanup { + if {$fn ne $gorpfile} { + removeFile $fn + } } -result 1 test cmdAH-25.2.1 {Tcl_FileObjCmd: owned} -constraints unix -setup { # Avoid problems with AFS |