Tcl Source Code

Artifact e81128ebbeb80769ec41693aa186be2d052b78fc:

Attachment "td-3549770-4.patch" to ticket [3549770fff] added by twylite 2012-07-30 21:46:21.

---

--- tests\fileSystem.test
+++ tests\fileSystem.test
@@ -17,17 +17,19 @@
 	file delete -force link.file
 	file delete -force dir.link
 	file delete -force [file join dir.dir linkinside.file]
     }
 
+testConstraint loaddll 0
 catch {
     ::tcltest::loadTestedCommands
     package require -exact Tcltest [info patchlevel]
-    set ::ddever [lindex [lsort [package versions dde]] end]
+    set ::ddever [package require dde]
     set ::ddelib [lindex [package ifneeded dde $::ddever] 1]
-    set ::regver [lindex [lsort [package versions registry]] end]
+    set ::regver [package require registry 1.3.0]
     set ::reglib [lindex [package ifneeded registry $::regver] 1]
+    testConstraint loaddll 1
 }
 
 # Test for commands defined in Tcltest executable
 testConstraint testfilesystem  	    [llength [info commands ::testfilesystem]]
 testConstraint testsetplatform 	    [llength [info commands ::testsetplatform]]
@@ -508,31 +510,31 @@
     while {![catch {testfilesystem 0}]} {}
 }
 
 test filesystem-7.1.1 {load from vfs} -setup {
     set dir [pwd]
-} -constraints {win testsimplefilesystem} -body {
+} -constraints {win testsimplefilesystem loaddll} -body {
     # This may cause a crash on exit
-    cd [file dirname [info nameof]]
+    cd [file dirname $::ddelib]
     testsimplefilesystem 1
     # This loads dde via a complex copy-to-temp operation
-    load simplefs:/$::ddelib dde
+    load simplefs:/[file tail $::ddelib] dde
     testsimplefilesystem 0
     return ok
     # The real result of this test is what happens when Tcl exits.
 } -cleanup {
     cd $dir
 } -result ok
 test filesystem-7.1.2 {load from vfs, and then unload again} -setup {
     set dir [pwd]
-} -constraints {win testsimplefilesystem} -body {
+} -constraints {win testsimplefilesystem loaddll} -body {
     # This may cause a crash on exit
-    cd [file dirname [info nameof]]
+    cd [file dirname $::reglib]
     testsimplefilesystem 1
     # This loads reg via a complex copy-to-temp operation
-    load simplefs:/$::reglib Registry
-    unload simplefs:/$::reglib
+    load simplefs:/[file tail $::reglib] Registry
+    unload simplefs:/[file tail $::reglib]
     testsimplefilesystem 0
     return ok
     # The real result of this test is what happens when Tcl exits.
 } -cleanup {
     cd $dir