Author: Michael A. Cleverly , Sergei Golovan Description: Adjusted for new soname (Closes: #381052). Replaced [package require Expect] by direct loading libexpect library in all tests because package management can't load the library from its build location. Last-Modified: 2009-11-18 --- a/Makefile.in +++ b/Makefile.in @@ -331,7 +331,7 @@ pkgIndex.tcl-hand: (echo 'if {![package vsatisfies [package provide Tcl] @TCL_VERSION@]} {return}' ; \ echo 'package ifneeded Expect $(PACKAGE_VERSION) \ - [list load [file join $$dir $(PKG_LIB_FILE)]]'\ + [list load [file join @prefix@ lib libexpect.so.@PACKAGE_VERSION@]]'\ ) > pkgIndex.tcl #======================================================================== --- a/tests/all.tcl +++ b/tests/all.tcl @@ -7,7 +7,7 @@ package require tcltest # do this in a way that is backward compatible for Tcl 8.3 namespace import ::tcltest::test ::tcltest::cleanupTests -package require Expect +load [lindex [glob libexpect*.so] 0] set ::tcltest::testSingleFile false set ::tcltest::testsDirectory [file dirname [info script]] --- a/tests/cat.test +++ b/tests/cat.test @@ -9,7 +9,7 @@ # do this in a way that is backward compatible for Tcl 8.3 namespace import ::tcltest::test ::tcltest::cleanupTests } -package require Expect +load [lindex [glob libexpect*.so] 0] #exp_internal -f /dev/ttyp5 0 --- a/tests/expect.test +++ b/tests/expect.test @@ -9,7 +9,7 @@ # do this in a way that is backward compatible for Tcl 8.3 namespace import ::tcltest::test ::tcltest::cleanupTests } -package require Expect +load [lindex [glob libexpect*.so] 0] catch {unset x} --- a/tests/logfile.test +++ b/tests/logfile.test @@ -9,7 +9,7 @@ # do this in a way that is backward compatible for Tcl 8.3 namespace import ::tcltest::test ::tcltest::cleanupTests } -package require Expect +load [lindex [glob libexpect*.so] 0] test logfile-1.1 {basic logfile} { set filename /tmp/logfile.[pid] --- a/tests/pid.test +++ b/tests/pid.test @@ -9,7 +9,7 @@ # do this in a way that is backward compatible for Tcl 8.3 namespace import ::tcltest::test ::tcltest::cleanupTests } -package require Expect +load [lindex [glob libexpect*.so] 0] catch {unset x} --- a/tests/send.test +++ b/tests/send.test @@ -9,7 +9,7 @@ # do this in a way that is backward compatible for Tcl 8.3 namespace import ::tcltest::test ::tcltest::cleanupTests } -package require Expect +load [lindex [glob libexpect*.so] 0] log_user 0 --- a/tests/spawn.test +++ b/tests/spawn.test @@ -9,7 +9,7 @@ # do this in a way that is backward compatible for Tcl 8.3 namespace import ::tcltest::test ::tcltest::cleanupTests } -package require Expect +load [lindex [glob libexpect*.so] 0] log_user 0 --- a/tests/stty.test +++ b/tests/stty.test @@ -9,7 +9,7 @@ # do this in a way that is backward compatible for Tcl 8.3 namespace import ::tcltest::test ::tcltest::cleanupTests } -package require Expect +load [lindex [glob libexpect*.so] 0] #exp_internal -f /dev/ttyp5 0