diff options
Diffstat (limited to 'tests/unixInit.test')
| -rw-r--r-- | tests/unixInit.test | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/tests/unixInit.test b/tests/unixInit.test index a303fd3..22840fb 100644 --- a/tests/unixInit.test +++ b/tests/unixInit.test @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: unixInit.test,v 1.42 2004/11/19 17:29:31 dgp Exp $ +# RCS: @(#) $Id: unixInit.test,v 1.43 2004/11/22 21:24:31 dgp Exp $ package require tcltest 2 namespace import -force ::tcltest::* @@ -95,10 +95,7 @@ test unixInit-1.2 {initialisation: standard channel type deduction} {unix stdio} proc getlibpath [list [list program [interpreter]]] { set f [open "|[list $program]" w+] fconfigure $f -buffering none - puts $f { - puts [list $::env(TCL_LIBRARY) [tcl::pkgconfig get scriptdir,runtime]] - exit - } + puts $f {puts $::tcl::LibPath; exit} set path [gets $f] close $f return $path @@ -125,8 +122,8 @@ test unixInit-2.1 {TclpInitLibraryPath: value of installLib, developLib} \ set prefix [file dirname [file dirname [interpreter]]] set x {} - lappend x [string compare [lindex $path 0] $prefix/$installLib] - lappend x [string compare [lindex $path 4] [file dirname $prefix]/$developLib] + lappend x [string compare [lindex $path 2] $prefix/$installLib] + lappend x [string compare [lindex $path 6] [file dirname $prefix]/$developLib] set x } {0 0} test unixInit-2.2 {TclpInitLibraryPath: TCL_LIBRARY} -constraints { @@ -206,7 +203,7 @@ test unixInit-2.6 {TclpInitLibraryPath: executable relative} \ makeFile {} [file join tmp sparkly lib tcl[info tclversion] init.tcl] set x [lrange [getlibpath [file join [temporaryDirectory] tmp sparkly \ - bin tcltest]] 0 1] + bin tcltest]] 2 3] removeFile [file join tmp sparkly lib tcl[info tclversion] init.tcl] removeDirectory [file join tmp sparkly lib tcl[info tclversion]] removeDirectory [file join tmp sparkly lib] @@ -289,7 +286,7 @@ test unixInit-2.9 {TclpInitLibraryPath: paths relative to executable} {unix noSp file mkdir /tmp/library/ close [open /tmp/library/init.tcl w] - set x [lrange [getlibpath /tmp/sparkly/tcltest] 0 4] + set x [lrange [getlibpath /tmp/sparkly/tcltest] 2 6] file delete -force /tmp/sparkly file delete -force /tmp/library @@ -311,7 +308,7 @@ test unixInit-2.10 {TclpInitLibraryPath: executable relative} -constraints { cd $libDir } -body { # Checking for Bug 832657 - set x [lrange [getlibpath [file join .. bin tcltest]] 2 3] + set x [lrange [getlibpath [file join .. bin tcltest]] 4 5] foreach p $x { lappend y [file normalize $p] } |