diff options
| -rw-r--r-- | library/auto.tcl | 4 | ||||
| -rw-r--r-- | tests/zipfs.test | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/library/auto.tcl b/library/auto.tcl index 44e2c57..b28451c 100644 --- a/library/auto.tcl +++ b/library/auto.tcl @@ -79,8 +79,8 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { set root [zipfs root] set mountpoint [file join $root lib $basename] lappend dirs [file join $root app ${basename}_library] - lappend dirs [file join $root lib $mountpoint ${basename}_library] - lappend dirs [file join $root lib $mountpoint] + lappend dirs [file join $root lib ${basename} ${basename}_library] + lappend dirs [file join $root lib ${basename}] if {![zipfs exists [file join $root app ${basename}_library]] \ && ![zipfs exists $mountpoint]} { set found 0 diff --git a/tests/zipfs.test b/tests/zipfs.test index 202d104..ba1a627 100644 --- a/tests/zipfs.test +++ b/tests/zipfs.test @@ -280,7 +280,7 @@ test zipfs-4.1 {zipfs lmkimg} -constraints zipfs -setup { zipfs lmkimg $targetImage [list $addFile test/add.tcl] {} $baseImage zipfs mount $targetImage ziptest try { - list [source $targetImage] [source //zipfs:/ziptest/test/add.tcl] + list [source $targetImage] [source ${ziproot}ziptest/test/add.tcl] } finally { zipfs unmount ziptest } @@ -300,7 +300,7 @@ test zipfs-4.2 {zipfs lmkimg: making an image from an image} -constraints zipfs zipfs lmkimg $targetImage [list $addFile test/ok.tcl] {} $midImage zipfs mount $targetImage ziptest try { - list [glob -tails -directory //zipfs://ziptest/test *.tcl] \ + list [glob -tails -directory ${ziproot}/ziptest/test *.tcl] \ [if {[file size $midImage] == [file size $targetImage]} { string cat equal } else { @@ -327,7 +327,7 @@ test zipfs-4.3 {zipfs lmkimg: stripping password} -constraints zipfs -setup { zipfs lmkimg $targetImage [list $addFile test/ok.tcl] {} $midImage zipfs mount $targetImage ziptest try { - glob -tails -directory //zipfs://ziptest/test *.tcl + glob -tails -directory ${ziproot}/ziptest/test *.tcl } finally { zipfs unmount ziptest } @@ -349,7 +349,7 @@ test zipfs-4.4 {zipfs lmkimg: final password} -constraints zipfs -setup { zipfs lmkimg $targetImage [list $addFile test/ok.tcl] $pass $midImage zipfs mount $targetImage ziptest try { - glob -tails -directory //zipfs://ziptest/test *.tcl + glob -tails -directory ${ziproot}/ziptest/test *.tcl } finally { zipfs unmount ziptest } @@ -368,18 +368,18 @@ test zipfs-4.5 {zipfs lmkimg: making image from mounted} -constraints zipfs -set } -body { zipfs lmkimg $midImage [list $addFile test/add.tcl] {} $baseImage zipfs mount $midImage ziptest - set f [glob -directory //zipfs://ziptest/test *.tcl] + set f [glob -directory ${ziproot}/ziptest/test *.tcl] zipfs lmkimg $targetImage [list $f test/ok.tcl] {} $midImage zipfs unmount ziptest zipfs mount $targetImage ziptest - list $f [glob -directory //zipfs://ziptest/test *.tcl] + list $f [glob -directory ${ziproot}/ziptest/test *.tcl] } -cleanup { zipfs unmount ziptest removeFile $baseImage removeFile $midImage removeFile $targetImage removeFile $addFile -} -result {//zipfs://ziptest/test/add.tcl //zipfs://ziptest/test/ok.tcl} +} -result [list ${ziproot}/ziptest/test/add.tcl ${ziproot}/ziptest/test/ok.tcl] test zipfs-5.1 {zipfs mount_data: short data} -constraints zipfs -body { zipfs mount_data {} gorp |