diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-17 20:02:36 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-17 20:02:36 (GMT) |
commit | 94d07354cee8df4983bb39da1268bbd22b9e2a91 (patch) | |
tree | 94e0421c21a72a754683d78ca169d5c2b93e0fbe /tests/fCmd.test | |
parent | e154c5151281fbbe01ef1361f5f6980a5ec5a6d3 (diff) | |
parent | 2881b5c3df298c14a851a8bed7d618a5761f4274 (diff) | |
download | tcl-94d07354cee8df4983bb39da1268bbd22b9e2a91.zip tcl-94d07354cee8df4983bb39da1268bbd22b9e2a91.tar.gz tcl-94d07354cee8df4983bb39da1268bbd22b9e2a91.tar.bz2 |
Merge 8.6
Diffstat (limited to 'tests/fCmd.test')
-rw-r--r-- | tests/fCmd.test | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/fCmd.test b/tests/fCmd.test index 709bfb4..87134d2 100644 --- a/tests/fCmd.test +++ b/tests/fCmd.test @@ -65,8 +65,7 @@ if {[testConstraint unix]} { # Also used in winFCmd... if {[testConstraint win]} { - set major [string index $tcl_platform(osVersion) 0] - if {$major > 5} { + if {$::tcl_platform(osVersion) >= 5.0} { testConstraint winVista 1 } else { testConstraint winXP 1 @@ -76,7 +75,7 @@ if {[testConstraint win]} { testConstraint darwin9 [expr { [testConstraint unix] && $tcl_platform(os) eq "Darwin" - && [package vsatisfies 1.$tcl_platform(osVersion) 1.9] + && [package vsatisfies 1.$::tcl_platform(osVersion) 1.9] }] testConstraint notDarwin9 [expr {![testConstraint darwin9]}] @@ -2307,7 +2306,7 @@ test fCmd-27.6 {TclFileAttrsCmd - setting more than one option} -setup { if { [testConstraint win] && - ([string index $tcl_platform(osVersion) 0] < 5 + ($::tcl_platform(osVersion) < 5.0 || [lindex [file system [temporaryDirectory]] 1] ne "NTFS") } then { testConstraint linkDirectory 0 |