Merge 8.6

1 files changed, 7 insertions, 5 deletions

diff --git a/tests/fCmd.test b/tests/fCmd.test
index 004392f..72a8f29 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -24,7 +24,7 @@ testConstraint testsetplatform [llength [info commands testsetplatform]]
 testConstraint testchmod [llength [info commands testchmod]]
 testConstraint winVista 0
 testConstraint winXP 0
-testConstraint win10 0
+testConstraint winLessThan10 0
 # Don't know how to determine this constraint correctly
 testConstraint notNetworkFilesystem 0
 testConstraint reg 0
@@ -68,8 +68,8 @@ if {[testConstraint unix]} {
 # Also used in winFCmd...
 if {[testConstraint win]} {
     if {$::tcl_platform(osVersion) >= 5.0} {
-	if {$::tcl_platform(osVersion) >= 10.0} {
-	    testConstraint win10 1
+	if {$::tcl_platform(osVersion) < 10.0} {
+	    testConstraint winLessThan10 1
 	}
 	if {$::tcl_platform(osVersion) >= 6.0} {
 	    testConstraint winVista 1
@@ -2360,13 +2360,15 @@ test fCmd-28.7 {file link: source already exists} -setup {
 } -returnCodes error -cleanup {
     cd [workingDirectory]
 } -result {could not create new link "abc.file": that path already exists}
-test fCmd-28.8 {file link} -constraints {linkFile win10} -setup {
+# In Windows 10 developer mode, we _can_ create symbolic links to files!
+test fCmd-28.8 {file link} -constraints {linkFile} -setup {
     cd [temporaryDirectory]
 } -body {
     file link -symbolic abc.link abc.file
 } -cleanup {
+    file delete -force abc.link
     cd [workingDirectory]
-} -result abc.file
+} -returnCodes error -result {could not create new link "abc.link" pointing to "abc.file": invalid argument}
 test fCmd-28.9 {file link: success with file} -constraints {linkFile} -setup {
     cd [temporaryDirectory]
     file delete -force abc.link