summaryrefslogtreecommitdiffstats
path: root/tests/fileSystem.test
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-30 15:03:43 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-30 15:03:43 (GMT)
commitffdffbb7b2d35e999050978c6f79e90c7021ea76 (patch)
treebba38eeec237389b77b4f0ee22093591f7558a7a /tests/fileSystem.test
parent3b740f47d77f695e1c75771c2350823c3abe5f65 (diff)
downloadtcl-ffdffbb7b2d35e999050978c6f79e90c7021ea76.zip
tcl-ffdffbb7b2d35e999050978c6f79e90c7021ea76.tar.gz
tcl-ffdffbb7b2d35e999050978c6f79e90c7021ea76.tar.bz2
fix filesystem-7.1.x tests in install environment [3549770], as suggested by Twylite
temporary workaround for winPipe failing tests (still work to do)
Diffstat (limited to 'tests/fileSystem.test')
-rw-r--r--tests/fileSystem.test20
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index ae84843..9469af0 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -19,13 +19,15 @@ namespace eval ::tcl::test::fileSystem {
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]
set ::reglib [lindex [package ifneeded registry $::regver] 1]
+ testConstraint loaddll 0
}
# Test for commands defined in Tcltest executable
@@ -510,12 +512,12 @@ if {[testConstraint testfilesystem]} {
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 $::reglib]
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.
@@ -524,13 +526,13 @@ test filesystem-7.1.1 {load from vfs} -setup {
} -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.